From 11a0f65bae425baf09508e2d57c830f5cad69df5 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 14 12月 2019 09:42:26 +0800 Subject: [PATCH] cleanup and change license generation parameters --- test/CMakeLists.txt | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 58bc28c..ca37f3d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,7 +1,23 @@ #if we're here boost has been found -include_directories(${Boost_INCLUDE_DIR}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +add_definitions(-DBOOST_ALL_NO_LIB) #Disable Boost Microsoft magic, all dependencies are handled by cmake +add_definitions(-DBOOST_LIB_DIAGNOSTIC) #Check it is really disabled +include_directories(${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) link_directories ( ${Boost_LIBRARY_DIR} ) +configure_file ( + "${CMAKE_CURRENT_SOURCE_DIR}/../src/templates/licensecc_properties_test.h.in" + "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp" +) +IF(${CMAKE_VERSION} VERSION_GREATER 3.0) + file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/$<CONFIG>/licensecc_properties_test.h" + INPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp") + include_directories ( ${CMAKE_BINARY_DIR}/include/$<CONFIG> ) +ELSE(${CMAKE_VERSION} VERSION_GREATER 3.0) +#patch for Centos 7 cmake 2.8.11 :( + file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/$<CONFIGURATION>/licensecc_properties_test.h" + INPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp") + include_directories ( ${CMAKE_BINARY_DIR}/include/$<CONFIGURATION> ) +endif(${CMAKE_VERSION} VERSION_GREATER 3.0) + add_subdirectory(library) add_subdirectory(functional) \ No newline at end of file -- Gitblit v1.9.1