From kde-commits Fri Jan 31 21:42:03 2014 From: Ivan Romanov Date: Fri, 31 Jan 2014 21:42:03 +0000 To: kde-commits Subject: [qca] /: cmake: use standard BUILD_SHARED_LIBS instead of own SHARED_LIBRARY Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=139120453215671 Git commit e42df7e95ce8461aa025359f47611a83ccde0127 by Ivan Romanov. Committed on 31/01/2014 at 21:36. Pushed by iromanov into branch 'master'. cmake: use standard BUILD_SHARED_LIBS instead of own SHARED_LIBRARY BUILD_SHARED_LIBS is internally defined is cmake. So it is a preferable way to choose shared or static library will be built. M +4 -10 CMakeLists.txt http://commits.kde.org/qca/e42df7e95ce8461aa025359f47611a83ccde0127 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7087691..5da25a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ cmake_policy(SET CMP0020 OLD) option(BUILD_TESTS "Create test" ON) option(BUILD_TOOLS "Compile mozcerts and qcatool" ON) set(BUILD_PLUGINS "auto" CACHE STRING "Plugins for building (also possible= values: none, all and auto)") -option(SHARED_LIBRARY "Build shared library" ON) +option(BUILD_SHARED_LIBS "Build shared library" ON) option(DEVELOPER_MODE "Special developer mode" OFF) = find_package(Doxygen) @@ -64,21 +64,15 @@ else() set(QCA_QT_PC_VERSION "QtCore") endif() = -if(SHARED_LIBRARY) - set(LIBRARY_TYPE "SHARED") -else(SHARED_LIBRARY) - set(LIBRARY_TYPE "STATIC") -endif(SHARED_LIBRARY) - # QCA can be shared but plugins will be static # if Qt is static. -if(NOT SHARED_LIBRARY OR QT_IS_STATIC) +if(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC) set(STATIC_PLUGINS ON) add_definitions(-DQT_STATICPLUGIN) set(PLUGIN_TYPE "STATIC") -else(NOT SHARED_LIBRARY OR QT_IS_STATIC) +else(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC) set(PLUGIN_TYPE "MODULE") -endif(NOT SHARED_LIBRARY OR QT_IS_STATIC) +endif(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC) = set(QCA_SUFFIX "" CACHE STRING "QCA common suffix") if(QCA_SUFFIX)