From a1b64080d1525a7a65e53f33d1a3fd257957e732 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 15 3月 2020 11:00:39 +0800
Subject: [PATCH] fix compilation errors
---
test/CMakeLists.txt | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d0497af..924c9f0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,23 +1,13 @@
#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} ${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"
)
-IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)
- file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/$<CONFIG>/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> )
-ELSE(CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)
-#patch for Centos 7 cmake 2.8.11 :(
- file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/$<CONFIGURATION>/licensecc_properties_test.h"
- INPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp")
- include_directories ( ${CMAKE_BINARY_DIR}/include/$<CONFIGURATION> )
-endif(CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)
+include_directories ( ${CMAKE_BINARY_DIR}/include/$<CONFIG> )
add_subdirectory(library)
add_subdirectory(functional)
\ No newline at end of file
--
Gitblit v1.9.1