From a98c3541b725f6bbb2e7d49201f4469d4548dac7 Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周六, 07 12月 2019 18:13:59 +0800 Subject: [PATCH] modified cmake scripts for easy export and import --- test/CMakeLists.txt | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d790c3f..ca37f3d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,17 +1,23 @@ #if we're here boost has been found 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}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +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" ) - -file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h" +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