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

Change from ZXCVBN_FOUND to ZXCVBN_LIBRARIES to be aligned with other libraries

Browse source
This commit is contained in:
Julian Andres Klode 2017-06-28 15:18:24 +02:00 • committed by Gianfranco Costamagna
parent 640b09c6b2
commit 34ff6d5f6b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/CMakeLists.txt
View file

@ -27,12 +27,12 @@ if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
set(GIT_DESCRIBE "") set(GIT_DESCRIBE "")
endif() endif()
find_library(ZXCVBN_FOUND zxcvbn) find_library(ZXCVBN_LIBRARIES zxcvbn)
if(NOT ZXCVBN_FOUND) if(NOT ZXCVBN_LIBRARIES)
add_library(zxcvbn STATIC zxcvbn/zxcvbn.cpp) add_library(zxcvbn STATIC zxcvbn/zxcvbn.cpp)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/zxcvbn) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/zxcvbn)
set(ZXCVBN_FOUND zxcvbn) set(ZXCVBN_LIBRARIES zxcvbn)
endif(NOT ZXCVBN_FOUND) endif(NOT ZXCVBN_LIBRARIES)
configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY) configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
@ -222,7 +222,7 @@ target_link_libraries(keepassx_core
${keepasshttp_LIB} ${keepasshttp_LIB}
${autotype_LIB} ${autotype_LIB}
${YUBIKEY_LIBRARIES} ${YUBIKEY_LIBRARIES}
${ZXCVBN_FOUND} ${ZXCVBN_LIBRARIES}
Qt5::Core Qt5::Core
Qt5::Network Qt5::Network
Qt5::Concurrent Qt5::Concurrent

2
src/cli/CMakeLists.txt
View file

@ -38,7 +38,7 @@ target_link_libraries(keepassxc-cli
${GCRYPT_LIBRARIES} ${GCRYPT_LIBRARIES}
${GPGERROR_LIBRARIES} ${GPGERROR_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${ZXCVBN_FOUND}) ${ZXCVBN_LIBRARIES})
install(TARGETS keepassxc-cli install(TARGETS keepassxc-cli
BUNDLE DESTINATION . COMPONENT Runtime BUNDLE DESTINATION . COMPONENT Runtime