diff options
author | Christian Kieschnick <christian.kieschnick@hicknhack-software.com> | 2019-01-04 11:33:00 +0300 |
---|---|---|
committer | Christian Kieschnick <christian.kieschnick@hicknhack-software.com> | 2019-01-04 11:33:00 +0300 |
commit | 080b02e9d538658d2ff6254022f2a8161e2b7da8 (patch) | |
tree | f2c42c87387bef18d2d939d3f51cee7ea423ac22 /CMakeLists.txt | |
parent | 3d02013513429f5fdca35e01f2248911e112df17 (diff) |
KeeShare uses only one flag - checks for QuaZip
Changed flag for KeeShare to
* enable insecure sharing in all cases
* enable secure sharing if QuaZip was found
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3370f1873..6e34a82c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,8 +47,7 @@ option(WITH_XC_NETWORKING "Include networking code (e.g. for downlading website option(WITH_XC_BROWSER "Include browser integration with keepassxc-browser." OFF) option(WITH_XC_YUBIKEY "Include YubiKey support." OFF) option(WITH_XC_SSHAGENT "Include SSH agent support." OFF) -option(WITH_XC_KEESHARE_INSECURE "Sharing integration with KeeShare with insecure sources" OFF) -option(WITH_XC_KEESHARE_SECURE "Sharing integration with KeeShare with secure sources" OFF) +option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF) if(APPLE) option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF) endif() @@ -60,20 +59,12 @@ if(WITH_XC_ALL) set(WITH_XC_BROWSER ON) set(WITH_XC_YUBIKEY ON) set(WITH_XC_SSHAGENT ON) - set(WITH_XC_KEESHARE_INSECURE ON) - set(WITH_XC_KEESHARE_SECURE ON) + set(WITH_XC_KEESHARE ON) if(APPLE) set(WITH_XC_TOUCHID ON) endif() endif() -if(WITH_XC_KEESHARE_INSECURE OR WITH_XC_KEESHARE_SECURE) - set(WITH_XC_KEESHARE ON) -else() - set(WITH_XC_KEESHARE OFF) -endif() - - if(WITH_XC_SSHAGENT OR WITH_XC_KEESHARE) set(WITH_XC_CRYPTO_SSH ON) else() @@ -367,10 +358,21 @@ endif() include_directories(SYSTEM ${ARGON2_INCLUDE_DIR}) # Optional -if(WITH_XC_KEESHARE_SECURE) - find_package(QuaZip REQUIRED) - - include_directories(SYSTEM ${QUAZIP_INCLUDE_DIR}) +if(WITH_XC_KEESHARE) + find_package(QuaZip QUIET) + if(QuaZip_FOUND) + message(STATUS "Found QuaZip - allow KeeShare with secure container\n") + set(WITH_XC_KEESHARE_INSECURE ON) + set(WITH_XC_KEESHARE_SECURE ON) + include_directories(SYSTEM ${QUAZIP_INCLUDE_DIR}) + else() + message(STATUS "No QuaZip - restrict KeeShare to insecure container\n") + set(WITH_XC_KEESHARE_INSECURE ON) + set(WITH_XC_KEESHARE_SECURE OFF) + endif() +else() + set(WITH_XC_KEESHARE_INSECURE OFF) + set(WITH_XC_KEESHARE_SECURE OFF) endif() # Optional |