From e3e83c70085d9a9c82b643b46d918fe3a2d21e03 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 14 12月 2019 11:35:52 +0800
Subject: [PATCH] fix windows compilation, better cmake output
---
test/CMakeLists.txt | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fc1f859..ec61aef 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})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-link_directories ( ${Boost_LIBRARY_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} ${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}/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(license-generator)
add_subdirectory(functional)
\ No newline at end of file
--
Gitblit v1.9.1