From 8faa8c86e08092c15d250a6f18a58ccbb27f68f2 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 01 9月 2019 18:50:18 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git

---
 src/library/CMakeLists.txt |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index 57642dd..de60a7d 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -1,18 +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
     license++.cpp
+    LicenseReader.cpp
+    pc-identifiers.c
 )
 
 target_link_libraries(
      license++_static
-     reader
+     ini
      os
 )
 
+install(TARGETS license++_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