From 49ad399c62aad6b8a12df8cba12f1a488912cd26 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 31 Jul 2014 20:22:08 +0400 Subject: [PATCH] add support of static library --- sources/CMakeLists.txt | 12 +++++++++--- sources/src/CMakeLists.txt | 6 ++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 96e8392..3cd978a 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -13,8 +13,8 @@ set (SUBPROJECT_AUTHOR "Evgeniy Alekseev") set (SUBPROJECT_CONTACT "esalexeev@gmail.com") set (SUBPROJECT_LICENSE "LGPLv3") set (SUBPROJECT_VERSION_MAJOR 1) -set (SUBPROJECT_VERSION_MINOR 0) -set (SUBPROJECT_VERSION_PATCH 2) +set (SUBPROJECT_VERSION_MINOR 1) +set (SUBPROJECT_VERSION_PATCH 0) set (SUBPROJECT_VERSION ${SUBPROJECT_VERSION_MAJOR}.${SUBPROJECT_VERSION_MINOR}.${SUBPROJECT_VERSION_PATCH}) string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC) string (TIMESTAMP CURRENT_YEAR "%Y") @@ -24,8 +24,9 @@ message (STATUS "Version: ${SUBPROJECT_VERSION}") message (STATUS "Build date: ${CURRENT_DATE}") # install options -set (BUILD_AS_LIBRARY ON CACHE BOOL "Build the application as a shared library") +set (BUILD_AS_LIBRARY ON CACHE BOOL "Build the application as a library") set (BUILD_DOCS OFF CACHE BOOL "Build developers documentation") +set (BUILD_SHARED_LIBRARY OFF CACHE BOOL "Build the shared library") set (ENABLE_GITHUB ON CACHE BOOL "Enable GitHub module") set (ENABLE_GITREPORT ON CACHE BOOL "Enable GitReport module") set (USE_QT5 ON CACHE BOOL "Use Qt5 instead of Qt4") @@ -39,6 +40,11 @@ endif () if (USE_OWN_TOKEN) set (ENABLE_GITREPORT OFF) endif () +if (BUILD_SHARED_LIBRARY) + set (LIBPROP SHARED) +else () + set (LIBPROP STATIC) +endif () # flags if (CMAKE_COMPILER_IS_GNUCXX) diff --git a/sources/src/CMakeLists.txt b/sources/src/CMakeLists.txt index 7e9d661..0675fd5 100644 --- a/sources/src/CMakeLists.txt +++ b/sources/src/CMakeLists.txt @@ -53,14 +53,16 @@ else () endif() if (BUILD_AS_LIBRARY) - add_library (${SUBPROJECT} SHARED ${SOURCES} ${HEADERS} ${MOC_SOURCES} ${UI_HEADERS}) + add_library (${SUBPROJECT} ${LIBPROP} ${SOURCES} ${HEADERS} ${MOC_SOURCES} ${UI_HEADERS}) else () add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES}) endif () target_link_libraries (${SUBPROJECT} ${QT_USED_LIBRARIES}) # install properties if (BUILD_AS_LIBRARY) - install (TARGETS ${SUBPROJECT} DESTINATION lib) + if (BUILD_SHARED_LIBRARY) + install (TARGETS ${SUBPROJECT} DESTINATION lib) + endif () else () install (TARGETS ${SUBPROJECT} DESTINATION bin) endif ()