Skip to content

Commit 43be122

Browse files
Be-ingfrankosterfeld
authored andcommitted
CMake: replace QTKEYCHAIN_STATIC with standard BUILD_SHARED_LIBS
BUILD_SHARED_LIBS is the standard CMake variable for controlling whether libraries are built dynamically or statically. Using a nonstandard variable requires extra work for packagers. https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html Fixes frankosterfeld#180
1 parent bcacc13 commit 43be122

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ include(ECMGeneratePriFile)
2222
option(BUILD_WITH_QT6 "Build qtkeychain with Qt 6" OFF)
2323
option(BUILD_TEST_APPLICATION "Build test application" OFF)
2424
option(BUILD_TRANSLATIONS "Build translations" ON)
25-
option(QTKEYCHAIN_STATIC "Build static library" OFF)
25+
option(BUILD_SHARED_LIBS "Build dynamic library" ON)
2626

2727
if(CMAKE_SYSTEM_NAME STREQUAL Android)
2828
set(ANDROID 1)
@@ -199,11 +199,7 @@ set(qtkeychain_TR_FILES
199199
)
200200

201201
set(QTKEYCHAIN_TARGET_NAME qt${QTKEYCHAIN_VERSION_INFIX}keychain)
202-
if(NOT QTKEYCHAIN_STATIC)
203-
add_library(${QTKEYCHAIN_TARGET_NAME} SHARED ${qtkeychain_SOURCES} ${qtkeychain_MOC_OUTFILES} ${qtkeychain_QM_FILES})
204-
else()
205-
add_library(${QTKEYCHAIN_TARGET_NAME} STATIC ${qtkeychain_SOURCES} ${qtkeychain_MOC_OUTFILES} ${qtkeychain_QM_FILES})
206-
endif()
202+
add_library(${QTKEYCHAIN_TARGET_NAME} ${qtkeychain_SOURCES} ${qtkeychain_MOC_OUTFILES} ${qtkeychain_QM_FILES})
207203
if(WIN32)
208204
set_target_properties( ${QTKEYCHAIN_TARGET_NAME} PROPERTIES DEBUG_POSTFIX "d" )
209205
endif()

0 commit comments

Comments
 (0)