diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c60faf6..313211cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() @@ -375,22 +375,62 @@ if( NOT NOGUI ) add_subdirectory( external_libraries/lxqt_wallet ) else() - if( LXQT_WALLET_VERSION VERSION_GREATER "3.1.0" ) + if( BUILD_WITH_QT6 ) - include_directories( ${LXQT_WALLET_INCLUDEDIR} ) - link_directories( ${LXQT_WALLET_LIBDIR} ) + if( LXQT_WALLET_VERSION VERSION_LESS "4.0.2" ) - # lxqt-wallet 4.0.0 renamed a header from "lxqtwallet.h" to "lxqt-wallet.h", - # so this is needed to choose the right header to include when compiling. - if( LXQT_WALLET_VERSION VERSION_GREATER "4.0.0" ) - add_compile_definitions( LXQT_WALLET_HYPHEN_HEADER ) - endif() + include_directories( external_libraries/lxqt_wallet ) + include_directories( external_libraries/lxqt_wallet/frontend ) + include_directories( external_libraries/lxqt_wallet/backend ) + + include_directories( ${PROJECT_BINARY_DIR}/external_libraries/lxqt_wallet/lxqt_wallet ) + include_directories( ${PROJECT_BINARY_DIR}/external_libraries/lxqt_wallet/lxqt_wallet/frontend ) + include_directories( ${PROJECT_BINARY_DIR}/external_libraries/lxqt_wallet/lxqt_wallet/backend ) + + add_subdirectory( external_libraries/lxqt_wallet ) + + message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "WARNING: Qt6 build requires lxqt-wallet >= 4.0.2, switching to bundled version" ) + message( STATUS "---------------------------------------------------------------------------" ) + else() + # lxqt-wallet 4.0.0 renamed a header from "lxqtwallet.h" to "lxqt-wallet.h", + # so this is needed to choose the right header to include when compiling. - message( STATUS "---------------------------------------------------------------------------" ) - message( STATUS "lxqt wallet support will be provided by an external libary" ) - message( STATUS "---------------------------------------------------------------------------" ) + if( LXQT_WALLET_VERSION VERSION_GREATER "4.0.0" ) + add_compile_definitions( LXQT_WALLET_HYPHEN_HEADER ) + endif() + + include_directories( ${LXQT_WALLET_INCLUDEDIR} ) + link_directories( ${LXQT_WALLET_LIBDIR} ) + + message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "lxqt wallet support will be provided by an external libary" ) + message( STATUS "---------------------------------------------------------------------------" ) + endif() else() - message( FATAL_ERROR "---------------------------------------------------------------------------\nInstalled version of lxqt_wallet is too old(<3.2.0)\nPlease install a more receant version from: https://github.com/lxqt/lxqt_wallet\n---------------------------------------------------------------------------" ) + if( LXQT_WALLET_VERSION VERSION_GREATER "3.1.0" ) + + include_directories( ${LXQT_WALLET_INCLUDEDIR} ) + link_directories( ${LXQT_WALLET_LIBDIR} ) + + message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "lxqt wallet support will be provided by an external libary" ) + message( STATUS "---------------------------------------------------------------------------" ) + else() + include_directories( external_libraries/lxqt_wallet ) + include_directories( external_libraries/lxqt_wallet/frontend ) + include_directories( external_libraries/lxqt_wallet/backend ) + + include_directories( ${PROJECT_BINARY_DIR}/external_libraries/lxqt_wallet/lxqt_wallet ) + include_directories( ${PROJECT_BINARY_DIR}/external_libraries/lxqt_wallet/lxqt_wallet/frontend ) + include_directories( ${PROJECT_BINARY_DIR}/external_libraries/lxqt_wallet/lxqt_wallet/backend ) + + add_subdirectory( external_libraries/lxqt_wallet ) + + message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "lxqt wallet support will be provided by an internal libary" ) + message( STATUS "---------------------------------------------------------------------------" ) + endif() endif() endif() endif() diff --git a/external_libraries/tasks/CMakeLists.txt b/external_libraries/tasks/CMakeLists.txt index 33cc06fb..6c82c86b 100644 --- a/external_libraries/tasks/CMakeLists.txt +++ b/external_libraries/tasks/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 9a38745d..16886585 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/plugins/gpg/CMakeLists.txt b/plugins/gpg/CMakeLists.txt index 6dd0b1e0..cd79f6f2 100644 --- a/plugins/gpg/CMakeLists.txt +++ b/plugins/gpg/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/plugins/hmac/CMakeLists.txt b/plugins/hmac/CMakeLists.txt index c3d4a5ea..6131a94c 100644 --- a/plugins/hmac/CMakeLists.txt +++ b/plugins/hmac/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/plugins/keydialog-qt/CMakeLists.txt b/plugins/keydialog-qt/CMakeLists.txt index 69ddf9e4..deb78ed2 100644 --- a/plugins/keydialog-qt/CMakeLists.txt +++ b/plugins/keydialog-qt/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/plugins/keykeyfile/CMakeLists.txt b/plugins/keykeyfile/CMakeLists.txt index e7805792..07f4c5fd 100644 --- a/plugins/keykeyfile/CMakeLists.txt +++ b/plugins/keykeyfile/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/plugins/steghide/CMakeLists.txt b/plugins/steghide/CMakeLists.txt index 952ea0c6..2d5b65d4 100644 --- a/plugins/steghide/CMakeLists.txt +++ b/plugins/steghide/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/plugins/tomb/CMakeLists.txt b/plugins/tomb/CMakeLists.txt index d3a1cc62..08d9aab6 100644 --- a/plugins/tomb/CMakeLists.txt +++ b/plugins/tomb/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/zuluCrypt-cli/CMakeLists.txt b/zuluCrypt-cli/CMakeLists.txt index ef5684ab..774efb3d 100644 --- a/zuluCrypt-cli/CMakeLists.txt +++ b/zuluCrypt-cli/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/zuluCrypt-gui/CMakeLists.txt b/zuluCrypt-gui/CMakeLists.txt index abf0f815..1d7203f9 100644 --- a/zuluCrypt-gui/CMakeLists.txt +++ b/zuluCrypt-gui/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/zuluCrypt-gui/sharedObjects/CMakeLists.txt b/zuluCrypt-gui/sharedObjects/CMakeLists.txt index b9510739..42f00e11 100644 --- a/zuluCrypt-gui/sharedObjects/CMakeLists.txt +++ b/zuluCrypt-gui/sharedObjects/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/zuluMount-gui/CMakeLists.txt b/zuluMount-gui/CMakeLists.txt index a1dd4544..e5cd0cd7 100644 --- a/zuluMount-gui/CMakeLists.txt +++ b/zuluMount-gui/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/zuluPolkit/CMakeLists.txt b/zuluPolkit/CMakeLists.txt index 908fe3f6..bdafe4ba 100644 --- a/zuluPolkit/CMakeLists.txt +++ b/zuluPolkit/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif() diff --git a/zuluSafe/CMakeLists.txt b/zuluSafe/CMakeLists.txt index 9df39a5e..1c90ee46 100644 --- a/zuluSafe/CMakeLists.txt +++ b/zuluSafe/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.26") - cmake_minimum_required(VERSION 3.5.0) + cmake_minimum_required(VERSION 3.26.0) else() cmake_minimum_required(VERSION 3.0.2) endif()