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
---
src/library/CMakeLists.txt | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index f1dd442..a9f75d8 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -15,21 +15,15 @@
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})
+ target_link_libraries(licensecc_static PUBLIC base ${EXTERNAL_LIBS})
ENDIF(UNIX OR OPENSSL_FOUND)
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)
--
Gitblit v1.9.1