From 34ff6d5f6bc02c6a691a4371c5286d56aac8e233 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 28 Jun 2017 15:18:24 +0200 Subject: [PATCH] Change from ZXCVBN_FOUND to ZXCVBN_LIBRARIES to be aligned with other libraries --- src/CMakeLists.txt | 10 +++++----- src/cli/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 05642ea8..18d737d2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,12 +27,12 @@ if (NOT GIT_HEAD OR NOT GIT_DESCRIBE) set(GIT_DESCRIBE "") endif() -find_library(ZXCVBN_FOUND zxcvbn) -if(NOT ZXCVBN_FOUND) +find_library(ZXCVBN_LIBRARIES zxcvbn) +if(NOT ZXCVBN_LIBRARIES) add_library(zxcvbn STATIC zxcvbn/zxcvbn.cpp) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/zxcvbn) - set(ZXCVBN_FOUND zxcvbn) -endif(NOT ZXCVBN_FOUND) + set(ZXCVBN_LIBRARIES zxcvbn) +endif(NOT ZXCVBN_LIBRARIES) configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY) @@ -222,7 +222,7 @@ target_link_libraries(keepassx_core ${keepasshttp_LIB} ${autotype_LIB} ${YUBIKEY_LIBRARIES} - ${ZXCVBN_FOUND} + ${ZXCVBN_LIBRARIES} Qt5::Core Qt5::Network Qt5::Concurrent diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt index 4731f7be..0e27f206 100644 --- a/src/cli/CMakeLists.txt +++ b/src/cli/CMakeLists.txt @@ -38,7 +38,7 @@ target_link_libraries(keepassxc-cli ${GCRYPT_LIBRARIES} ${GPGERROR_LIBRARIES} ${ZLIB_LIBRARIES} - ${ZXCVBN_FOUND}) + ${ZXCVBN_LIBRARIES}) install(TARGETS keepassxc-cli BUNDLE DESTINATION . COMPONENT Runtime