From d35591346c48606697898338c1c01a3d52c520eb Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周三, 01 1月 2020 20:23:54 +0800
Subject: [PATCH] update build system and cleanup
---
src/library/CMakeLists.txt | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index a9f75d8..ffa4a76 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -1,24 +1,27 @@
add_subdirectory("base")
+add_subdirectory("os")
+add_subdirectory("locate")
+add_subdirectory("pc_identifier")
ADD_LIBRARY(licensecc_static STATIC
licensecc.cpp
LicenseReader.cpp
- pc-identifiers.c
limits/license_verifier.cpp
ini/ConvertUTF.c
+ $<TARGET_OBJECTS:locate>
+ $<TARGET_OBJECTS:os>
+ $<TARGET_OBJECTS:base>
)
-add_subdirectory("locate")
-add_subdirectory("os")
define_property(TARGET PROPERTY WITH_OPENSSL BRIEF_DOCS "need openssl to compile" FULL_DOCS "ff")
IF(UNIX OR OPENSSL_FOUND)
target_compile_definitions(licensecc_static PUBLIC HAS_OPENSSL)
set_target_properties(licensecc_static PROPERTIES WITH_OPENSSL 1)
- target_link_libraries(licensecc_static PUBLIC base OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
+ target_link_libraries(licensecc_static PUBLIC 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 PUBLIC base ${EXTERNAL_LIBS})
+ target_link_libraries(licensecc_static PUBLIC ${EXTERNAL_LIBS})
ENDIF(UNIX OR OPENSSL_FOUND)
target_include_directories(licensecc_static
--
Gitblit v1.9.1