From e22505aee5a36e2290c32ccec12d50ec4e7fde27 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 30 11月 2019 18:48:45 +0800 Subject: [PATCH] fix centos tests --- test/CMakeLists.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d790c3f..2c02526 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,8 +1,7 @@ #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 ( @@ -10,8 +9,9 @@ "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp" ) -file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h" +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> ) add_subdirectory(library) add_subdirectory(functional) \ No newline at end of file -- Gitblit v1.9.1