From 897303206e87db7616b8c5f11b894c94b1047e7c Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周一, 08 9月 2014 05:59:02 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git
---
src/license-generator/CMakeLists.txt | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/license-generator/CMakeLists.txt b/src/license-generator/CMakeLists.txt
index f4dd6c9..3ad19ef 100644
--- a/src/license-generator/CMakeLists.txt
+++ b/src/license-generator/CMakeLists.txt
@@ -1,4 +1,8 @@
+include_directories(${Boost_INCLUDE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+link_directories ( ${Boost_LIBRARY_DIR} )
+
if(WIN32)
ADD_LIBRARY(
license_generator_lib STATIC
@@ -13,15 +17,15 @@
)
endif(WIN32)
-#link_directories ( ${Boost_LIBRARY_DIRS} )
-#add_dependencies( license_generator_lib boost_filesystem private_key )
-
target_link_libraries(
license_generator_lib
license++_static
- ${Boost_filesystem_LIBRARY}
- ${Boost_program_options_LIBRARY}
- ${Boost_system_LIBRARY}
+ $<$<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}
)
@@ -34,6 +38,7 @@
license_generator
license_generator_lib
)
+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
--
Gitblit v1.9.1