diff options
| author | Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | 2017-06-28 15:58:29 +0300 |
|---|---|---|
| committer | Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | 2017-06-28 16:13:57 +0300 |
| commit | 640b09c6b23a5c53776b503ea4f9e066c063b515 (patch) | |
| tree | 1f6a2150a0040dad9608c9d0c6b789639225a23f /src | |
| parent | 079e383319ffb95b804610525012c1d3e7f5ea0e (diff) | |
Add code to detect a system library for zxcvbn, with fallback to the embedded one in case it is not found
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/cli/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/cli/EntropyMeter.cpp | 2 | ||||
| -rw-r--r-- | src/core/PasswordGenerator.cpp | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 791685576..05642ea8d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,6 +27,13 @@ if (NOT GIT_HEAD OR NOT GIT_DESCRIBE) set(GIT_DESCRIBE "") endif() +find_library(ZXCVBN_FOUND zxcvbn) +if(NOT ZXCVBN_FOUND) + add_library(zxcvbn STATIC zxcvbn/zxcvbn.cpp) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/zxcvbn) + set(ZXCVBN_FOUND zxcvbn) +endif(NOT ZXCVBN_FOUND) + configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY) set(keepassx_SOURCES @@ -203,9 +210,6 @@ else() list(APPEND keepassx_SOURCES keys/drivers/YubiKeyStub.cpp) endif() -add_library(zxcvbn STATIC zxcvbn/zxcvbn.cpp) -target_link_libraries(zxcvbn) - add_library(autotype STATIC ${autotype_SOURCES}) target_link_libraries(autotype Qt5::Core Qt5::Widgets) @@ -218,7 +222,7 @@ target_link_libraries(keepassx_core ${keepasshttp_LIB} ${autotype_LIB} ${YUBIKEY_LIBRARIES} - zxcvbn + ${ZXCVBN_FOUND} Qt5::Core Qt5::Network Qt5::Concurrent diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt index 86edb9c01..4731f7be5 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) + ${ZXCVBN_FOUND}) install(TARGETS keepassxc-cli BUNDLE DESTINATION . COMPONENT Runtime diff --git a/src/cli/EntropyMeter.cpp b/src/cli/EntropyMeter.cpp index a62cd3077..5c531af5e 100644 --- a/src/cli/EntropyMeter.cpp +++ b/src/cli/EntropyMeter.cpp @@ -20,7 +20,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include "zxcvbn/zxcvbn.h" +#include <zxcvbn.h> /* For pre-compiled headers under windows */ #ifdef _WIN32 diff --git a/src/core/PasswordGenerator.cpp b/src/core/PasswordGenerator.cpp index cdff204a0..21aa590e0 100644 --- a/src/core/PasswordGenerator.cpp +++ b/src/core/PasswordGenerator.cpp @@ -19,7 +19,7 @@ #include "PasswordGenerator.h" #include "crypto/Random.h" -#include "zxcvbn/zxcvbn.h" +#include <zxcvbn.h> PasswordGenerator::PasswordGenerator() : m_length(0) |