From de9854e773ac0cf7a3b888a07f6ad68b47bf1171 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 24 Nov 2021 17:59:22 +0100 Subject: [PATCH] fix message for lto and get/put target --- CMakeLists.txt | 19 +++++++++++-------- slsDetectorSoftware/CMakeLists.txt | 5 +---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85f79865d..b6d7450f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,14 +67,7 @@ set(ClangFormat_EXCLUDE_PATTERNS "build/" ${CMAKE_BINARY_DIR}) find_package(ClangFormat) -#Enable LTO if available -include(CheckIPOSupported) -check_ipo_supported(RESULT SLS_LTO_AVAILABLE) -if (SLS_LTO_AVAILABLE) - message(STATUS "Building with link time optimization") -else() - message(STATUS "Link time optimization is not available") -endif() + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -85,6 +78,16 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) endif() +#Enable LTO if available +include(CheckIPOSupported) +check_ipo_supported(RESULT SLS_LTO_AVAILABLE) +if if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE) + message(STATUS "Building with link time optimization") +else() + message(STATUS "Building without link time optimization") +endif() + + #Add two fake libraries to manage options add_library(slsProjectOptions INTERFACE) add_library(slsProjectWarnings INTERFACE) diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index 1a6b922f0..ce88e0ca8 100755 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -69,9 +69,6 @@ list(APPEND DETECTOR_LIBRARY_TARGETS slsDetectorStatic) if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE) set_property(TARGET ${DETECTOR_LIBRARY_TARGETS} PROPERTY INTERPROCEDURAL_OPTIMIZATION True) - # set_property(TARGET slsDetectorObject PROPERTY INTERPROCEDURAL_OPTIMIZATION True) - # set_property(TARGET slsDetectorStatic PROPERTY INTERPROCEDURAL_OPTIMIZATION True) - # set_property(TARGET slsDetectorShared PROPERTY INTERPROCEDURAL_OPTIMIZATION True) endif() @@ -100,7 +97,7 @@ if(SLS_USE_TEXTCLIENT) RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin COMPILE_DEFINITIONS ${val2}=1 ) - if(SLS_LTO_AVAILABLE) + if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE) set_property(TARGET ${val1} PROPERTY INTERPROCEDURAL_OPTIMIZATION True) endif() endforeach()