From 9aa08adb3d49cf4cffd0d1dd5a479d3b757f52cc Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 24 11月 2019 21:27:46 +0800
Subject: [PATCH] use update submodule
---
test/CMakeLists.txt | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fc1f859..d790c3f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,8 +1,17 @@
#if we're here boost has been found
-include_directories(${Boost_INCLUDE_DIRS})
+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})
-link_directories ( ${Boost_LIBRARY_DIRS} )
+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"
+ INPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp")
+
add_subdirectory(library)
-add_subdirectory(license-generator)
add_subdirectory(functional)
\ No newline at end of file
--
Gitblit v1.9.1