From 65454077a8c63b50adda4e8c6095c8f00675c4d2 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 08 3月 2020 21:45:16 +0800
Subject: [PATCH] Merge branch 'feature/pc_identifiers' of https://github.com/open-license-manager/open-license-manager.git into feature/pc_identifiers
---
test/CMakeLists.txt | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d0497af..ec61aef 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,16 +8,10 @@
"${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