From 0ec4d68600b83d41d2e48ad35d18e2a00f234619 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.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/tools/license-generator/CMakeLists.txt | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/tools/license-generator/CMakeLists.txt b/src/tools/license-generator/CMakeLists.txt
index 35199f7..e707d5f 100644
--- a/src/tools/license-generator/CMakeLists.txt
+++ b/src/tools/license-generator/CMakeLists.txt
@@ -1,8 +1,6 @@
-
include_directories(${Boost_INCLUDE_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
link_directories ( ${Boost_LIBRARY_DIR} )
-
ADD_LIBRARY(
license_generator_lib STATIC
@@ -12,12 +10,11 @@
target_link_libraries(
license_generator_lib
tools_base
+ licensepp_static
$<$<CONFIG:Debug>:${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}>
$<$<NOT:$<CONFIG:Debug>>:${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}>
$<$<CONFIG:Debug>:${Boost_SYSTEM_LIBRARY_DEBUG}>
$<$<NOT:$<CONFIG:Debug>>:${Boost_SYSTEM_LIBRARY_RELEASE}>
- $<$<CONFIG:Debug>:${Boost_DATE_TIME_LIBRARY_DEBUG}>
- $<$<NOT:$<CONFIG:Debug>>:${Boost_DATE_TIME_LIBRARY_RELEASE}>
${EXTERNAL_LIBS}
)
@@ -32,5 +29,5 @@
)
add_dependencies( license_generator private_key )
-#SET_TARGET_PROPERTIES(license_generator PROPERTIES LINK_SEARCH_START_STATIC ON)
-#SET_TARGET_PROPERTIES(license_generator PROPERTIES LINK_SEARCH_END_STATIC ON)
\ No newline at end of file
+install(TARGETS license_generator RUNTIME DESTINATION bin)
+
--
Gitblit v1.9.1