Skip to content

Commit

Permalink
Fix out of date optimized build commands
Browse files Browse the repository at this point in the history
fix #4733
  • Loading branch information
kbenne committed Feb 19, 2015
1 parent 192db37 commit d5e57ec
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,14 @@ endif()


set(OPTIMIZABLE_TARGETS
sqlite objexx bcvtb epexpat epfmiimport miniziplib DElight EnergyPlus EnergyPlusAPI EnergyPlusLib EnergyPlusLib2
sqlite objexx bcvtb epexpat epfmiimport miniziplib DElight energyplus energyplusapi energypluslib energypluslib2
)
if(NOT APPLE AND NOT MSVC)
list(APPEND OPTIMIZABLE_TARGETS parser)
endif()

if(NOT MSVC)
list(APPEND OPTIMIZABLE_TARGETS objexx_tests EnergyPlus_tests)
list(APPEND OPTIMIZABLE_TARGETS objexx_tests energyplus_tests)
endif()

if(MSVC AND (PROFILE_GENERATE OR PROFILE_USE OR ENABLE_LTO) )
Expand Down Expand Up @@ -254,12 +254,12 @@ elseif (CMAKE_COMPILER_IS_GNUCXX)
if(ENABLE_LTO)
set_target_properties(${OPTIMIZABLE_TARGETS}
PROPERTIES LINK_FLAGS "-flto=7 -fno-use-linker-plugin" COMPILE_FLAGS "-flto=7 -fno-use-linker-plugin")
set_target_properties(EnergyPlus
set_target_properties(energyplus
PROPERTIES LINK_FLAGS "-flto=7 -fuse-linker-plugin -fwhole-program" COMPILE_FLAGS "-flto=7 -fuse-linker-plugin -fwhole-program")
endif()

if (PROFILE_GENERATE)
set_target_properties(${OPTIMIZABLE_TARGETS} EnergyPlus_tests TestEnergyPlusCallbacks
set_target_properties(${OPTIMIZABLE_TARGETS} energyplus_tests TestEnergyPlusCallbacks
PROPERTIES LINK_FLAGS "-fprofile-generate" COMPILE_FLAGS "-fprofile-generate")
endif()

Expand All @@ -271,12 +271,12 @@ elseif (CMAKE_COMPILER_IS_GNUCXX)
if (PROFILE_USE AND ENABLE_LTO)
set_target_properties(${OPTIMIZABLE_TARGETS}
PROPERTIES LINK_FLAGS "-flto=7 -fno-use-linker-plugin -fprofile-use" COMPILE_FLAGS "-flto=7 -fno-use-linker-plugin -fprofile-use")
set_target_properties(EnergyPlus
set_target_properties(energyplus
PROPERTIES LINK_FLAGS "-flto=7 -fuse-linker-plugin -fwhole-program -fprofile-use" COMPILE_FLAGS "-flto=7 -fuse-linker-plugin -fwhole-program -fprofile-use")
endif()
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) # Clang
if(ENABLE_LTO)
set_target_properties(EnergyPlus
set_target_properties(energyplus
PROPERTIES LINK_FLAGS "-flto" COMPILE_FLAGS "-flto")
endif()

Expand Down

7 comments on commit d5e57ec

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (kbenne) - x86_64-MacOS-10.9-clang: OK (1593 of 1595 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (kbenne) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1600 of 1601 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (kbenne) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (kbenne) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (605 of 605 tests passed)

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (kbenne) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1104 of 1104 tests passed)

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (kbenne) - Win64-Windows-7-VisualStudio-12: OK (1599 of 1601 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (kbenne) - i386-Windows-7-VisualStudio-12: OK (1600 of 1601 tests passed)

Build Badge Test Badge

Please sign in to comment.