From 87ef087f7ae2729388bfb7f4adb05974ead449e0 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 30 11月 2019 14:56:28 +0800
Subject: [PATCH] merge commits
---
test/CMakeLists.txt | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d790c3f..c1be16e 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,10 @@
"${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp"
)
-file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h"
+cmake_policy(SET CMP0070 NEW)
+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