From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周四, 29 5月 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop

---
 test/CMakeLists.txt |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1fc3729..924c9f0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,7 +1,13 @@
 #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
+
+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)
\ No newline at end of file
+add_subdirectory(functional)
\ No newline at end of file

--
Gitblit v1.9.1