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

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

View File

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

View File

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