Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-24 13:41:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change link sequence to allow static versions of libgpg-error and libgcrypt.

Browse Source
This commit is contained in:
tuxmaster5000 2020-04-02 07:59:34 +02:00 committed by Jonathan White
parent 0a61aa0d46
commit e316a09a79
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -325,9 +325,8 @@ target_link_libraries(keepassx_core
${YUBIKEY_LIBRARIES} ${YUBIKEY_LIBRARIES}
${ZXCVBN_LIBRARIES} ${ZXCVBN_LIBRARIES}
${ARGON2_LIBRARIES} ${ARGON2_LIBRARIES}
${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES}
${GPGERROR_LIBRARIES} )
${ZLIB_LIBRARIES})
if(WITH_XC_SSHAGENT) if(WITH_XC_SSHAGENT)
target_link_libraries(keepassx_core sshagent) target_link_libraries(keepassx_core sshagent)
@ -369,6 +368,7 @@ if(MINGW)
endif() endif()
add_executable(${PROGNAME} WIN32 ${keepassx_SOURCES_MAINEXE} ${WIN32_ProductVersionFiles}) add_executable(${PROGNAME} WIN32 ${keepassx_SOURCES_MAINEXE} ${WIN32_ProductVersionFiles})
target_link_libraries(keepassx_core ${GCRYPT_LIBRARIES} ${GPGERROR_LIBRARIES})
target_link_libraries(${PROGNAME} keepassx_core) target_link_libraries(${PROGNAME} keepassx_core)
set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON) set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON)

2
src/cli/CMakeLists.txt
View File

@ -52,13 +52,13 @@ endif()
add_executable(keepassxc-cli keepassxc-cli.cpp) add_executable(keepassxc-cli keepassxc-cli.cpp)
target_link_libraries(keepassxc-cli target_link_libraries(keepassxc-cli
${GPGERROR_LIBRARIES}
cli cli
keepassx_core keepassx_core
Qt5::Core Qt5::Core
${GCRYPT_LIBRARIES} ${GCRYPT_LIBRARIES}
${sodium_LIBRARY_RELEASE} ${sodium_LIBRARY_RELEASE}
${ARGON2_LIBRARIES} ${ARGON2_LIBRARIES}
${GPGERROR_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${ZXCVBN_LIBRARIES}) ${ZXCVBN_LIBRARIES})