From 66e8c7601d2c52626e4ff39f2559cff3271eb770 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 12月 2019 15:34:38 +0800
Subject: [PATCH] centos 7 update cmake
---
src/templates/licensecc_properties.h.in | 2 +-
src/cmake/licensecc-config.cmake | 18 +++++++++++-------
src/library/CMakeLists.txt | 12 +++---------
extern/license-generator | 2 +-
.travis.yml | 7 ++++---
CMakeLists.txt | 5 ++---
6 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5e787b5..52c80db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,9 +82,10 @@
before_script:
- docker run --name centos7_toconfigure -v `pwd`:/root/open-license-manager centos:centos7 /bin/bash -c
"yum -y update && yum -y install install centos-release-scl &&
- yum -y install cmake boost boost-devel boost-static openssl openssl-devel glibc-static devtoolset-7-toolchain devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-valgrind-devel &&
- cd /root/open-license-manager/build &&
- CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ cmake .."
+ yum -y install wget boost boost-devel boost-static openssl openssl-devel openssl-static glibc-static devtoolset-7-toolchain devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-valgrind-devel &&
+ wget https://cmake.org/files/v3.11/cmake-3.11.0.tar.gz && tar zxvf cmake-3.11.0.tar.gz && cd cmake-3.11.0 &&
+ export CC=/opt/rh/devtoolset-7/root/usr/bin/gcc && export CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ &&
+ ./bootstrap && make && make install && cd /root/open-license-manager/build && cmake .."
- docker commit centos7_toconfigure centos7_configured
script:
- docker run --name centos7_make -v `pwd`:/root/open-license-manager centos7_configured /bin/bash -c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 405cd5c..939aeaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
SET(LICENSECC_SHORT_LICENSE "BSD Software License")
@@ -34,8 +34,7 @@
SET(CMAKE_CROSSCOMPILING_EMULATOR "wine")
ENDIF()
-
-SET ( OPENSSL_USE_STATIC_LIBS ON )
+SET (OPENSSL_USE_STATIC_LIBS ON)
find_package(OpenSSL COMPONENTS Crypto)
IF(OPENSSL_FOUND)
MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION}")
diff --git a/extern/license-generator b/extern/license-generator
index 12eaeb7..33b74eb 160000
--- a/extern/license-generator
+++ b/extern/license-generator
@@ -1 +1 @@
-Subproject commit 12eaeb702ad788ccc4ac054d69f2c819783d57c1
+Subproject commit 33b74eb3fcf786dcf1a2f53b038917437cbeb8cd
diff --git a/src/cmake/licensecc-config.cmake b/src/cmake/licensecc-config.cmake
index 9b12d05..92909bb 100644
--- a/src/cmake/licensecc-config.cmake
+++ b/src/cmake/licensecc-config.cmake
@@ -1,5 +1,4 @@
# licensecc-config.cmake - package configuration file
-
get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
if(licensecc_FIND_COMPONENTS)
foreach(component ${licensecc_FIND_COMPONENTS})
@@ -9,26 +8,31 @@
set(${component}_FOUND true CACHE BOOL "Licensecc ${component} present")
else(EXISTS "${cmakefile}")
set(${component}_FOUND false CACHE BOOL "Licensecc ${component} present")
+ message( WARNING "Component ${component} declared but not found." )
endif(EXISTS "${cmakefile}")
mark_as_advanced(${component}_FOUND)
endforeach(component)
else(licensecc_FIND_COMPONENTS)
- if(LCC_PROJECT_NAME AND (EXISTS "${SELF_DIR}/${LCC_PROJECT_NAME}/cmake/licensecc.cmake"))
- include("${SELF_DIR}/${LCC_PROJECT_NAME}/cmake/licensecc.cmake")
- set(${LCC_PROJECT_NAME}_FOUND true CACHE BOOL "Licensecc ${LCC_PROJECT_NAME} present")
+ if(LCC_PROJECT_NAME)
+ if(EXISTS "${SELF_DIR}/${LCC_PROJECT_NAME}/cmake/licensecc.cmake")
+ include("${SELF_DIR}/${LCC_PROJECT_NAME}/cmake/licensecc.cmake")
+ set(${LCC_PROJECT_NAME}_FOUND true CACHE BOOL "Licensecc ${LCC_PROJECT_NAME} present")
+ else()
+ message( WARNING "Variable LCC_PROJECT_NAME declared but project ${LCC_PROJECT_NAME} not found.")
+ endif()
mark_as_advanced(${LCC_PROJECT_NAME}_FOUND)
- else()
+ else(LCC_PROJECT_NAME)
if(PROJECT_NAME AND (EXISTS "${SELF_DIR}/${PROJECT_NAME}/cmake/licensecc.cmake"))
include("${SELF_DIR}/${PROJECT_NAME}/cmake/licensecc.cmake")
set(${PROJECT_NAME}_FOUND true CACHE BOOL "Licensecc ${PROJECT_NAME} present")
mark_as_advanced(${PROJECT_NAME}_FOUND)
endif()
- endif()
+ endif(LCC_PROJECT_NAME)
endif(licensecc_FIND_COMPONENTS)
get_property(COMPILE_DEF TARGET licensecc::licensecc_static PROPERTY INTERFACE_COMPILE_DEFINITIONS)
if("HAS_OPENSSL" IN_LIST COMPILE_DEF AND NOT OpenSSL_FOUND)
- message(DEBUG "Trying to find openssl (required by the target)")
+ #message( VERBOSE "Trying to find openssl (required by the target)")
SET ( OPENSSL_USE_STATIC_LIBS ON )
find_package(OpenSSL REQUIRED COMPONENTS Crypto)
endif()
\ No newline at end of file
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index f1dd442..d3a4388 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -15,13 +15,7 @@
IF(UNIX OR OPENSSL_FOUND)
target_compile_definitions(licensecc_static PUBLIC HAS_OPENSSL)
set_target_properties(licensecc_static PROPERTIES WITH_OPENSSL 1)
- if (CMAKE_VERSION VERSION_GREATER 3.5)
- target_link_libraries(licensecc_static PUBLIC base OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
- #patch for old cmake in Centos 7
- ELSE(CMAKE_VERSION VERSION_GREATER 3.5)
- target_link_libraries(licensecc_static PUBLIC base ${OPENSSL_CRYPTO_LIBRARY} ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
- include_directories(${OPENSSL_INCLUDE_DIR})
- ENDIF(CMAKE_VERSION VERSION_GREATER 3.5)
+ target_link_libraries(licensecc_static PUBLIC base OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
ELSE(UNIX OR OPENSSL_FOUND)
set_target_properties(licensecc_static PROPERTIES WITH_OPENSSL 0)
target_link_libraries(licensecc_static ${EXTERNAL_LIBS})
@@ -29,7 +23,7 @@
target_include_directories(licensecc_static
INTERFACE
- $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
+ $<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
)
@@ -38,4 +32,4 @@
ARCHIVE DESTINATION ${main_lib_dest}/${LCC_PROJECT_NAME})
install(EXPORT licensecc NAMESPACE licensecc:: DESTINATION ${main_lib_dest}/${LCC_PROJECT_NAME}/cmake)
-export(EXPORT licensecc NAMESPACE licensecc:: FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config.cmake)
+export(EXPORT licensecc NAMESPACE licensecc:: FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.cmake)
diff --git a/src/templates/licensecc_properties.h.in b/src/templates/licensecc_properties.h.in
index 9d05fc3..1b18b8d 100644
--- a/src/templates/licensecc_properties.h.in
+++ b/src/templates/licensecc_properties.h.in
@@ -5,7 +5,7 @@
//License retrieval configuration
#define FIND_LICENSE_NEAR_MODULE 1
-#define FIND_LICENSE_WITH_ENV_VAR 1
+#define FIND_LICENSE_WITH_ENV_VAR 0
#define LICENSE_LOCATION_ENV_VAR "LICENSE_LOCATION"
#define LICENSE_DATA_ENV_VAR "LICENSE_DATA"
--
Gitblit v1.9.1