From 55419547206c2be326503a220575d6a124ea16cc Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 21 9月 2019 01:34:22 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop
---
src/library/CMakeLists.txt | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index c841fef..d1f0813 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -1,33 +1,21 @@
-IF(WIN32)
- add_subdirectory("os/win")
-ELSE(WIN32)
- add_subdirectory("os/linux")
-ENDIF(WIN32)
-add_subdirectory("base")
-add_subdirectory("reader")
+add_subdirectory("os")
+add_subdirectory("base")
+add_subdirectory("ini")
-ADD_LIBRARY(license++_static STATIC
+ADD_LIBRARY(licensepp_static STATIC
license++.cpp
+ LicenseReader.cpp
+ pc-identifiers.c
)
target_link_libraries(
- license++_static
- reader
+ licensepp_static
+ ini
os
- ${EXTERNAL_LIBS}
)
-ADD_LIBRARY(license++ SHARED
- license++.cpp
-)
-
-SET_TARGET_PROPERTIES(license++ PROPERTIES LINK_SEARCH_START_STATIC OFF)
-SET_TARGET_PROPERTIES(license++ PROPERTIES LINK_SEARCH_END_STATIC OFF)
-
-target_link_libraries(
- license++
- reader_dynl
- #os
- #${EXTERNAL_LIBS}
-)
-set_target_properties(license++ PROPERTIES PREFIX "lib")
\ No newline at end of file
+install(TARGETS licensepp_static ARCHIVE DESTINATION lib)
+install(FILES api/datatypes.h api/license++.h DESTINATION include/api)
+install(FILES base/base.h DESTINATION include/base)
+install(FILES pc-identifiers.h DESTINATION include/)
+install(FILES ini/SimpleIni.h ini/ConvertUTF.h DESTINATION include/ini)
--
Gitblit v1.9.1