From b3ac65763c0397891106329ffb8c204408d919d1 Mon Sep 17 00:00:00 2001 From: mhogomchungu Date: Thu, 7 Nov 2024 22:04:14 +0300 Subject: [PATCH] fix a build issue --- .../lxqt_wallet/frontend/CMakeLists.txt | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/3rdParty/lxqt_wallet/frontend/CMakeLists.txt b/src/3rdParty/lxqt_wallet/frontend/CMakeLists.txt index b66215d2..d0e4bbb8 100644 --- a/src/3rdParty/lxqt_wallet/frontend/CMakeLists.txt +++ b/src/3rdParty/lxqt_wallet/frontend/CMakeLists.txt @@ -52,15 +52,15 @@ else() endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0 ) - set( CMAKE_CXX_STANDARD 14 ) + set( CMAKE_CXX_STANDARD 14 ) elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0) - set( CMAKE_CXX_STANDARD 14 ) + set( CMAKE_CXX_STANDARD 14 ) else() - set( CMAKE_CXX_STANDARD 14 ) - if(${CMAKE_VERSION} VERSION_LESS "3.1.0") - message("Warning your cmake version is too old(<3.1.0) and code my not compile") - add_definitions(-std=c++14) - endif() + set( CMAKE_CXX_STANDARD 14 ) + if(${CMAKE_VERSION} VERSION_LESS "3.1.0") + message("Warning your cmake version is too old(<3.1.0) and code my not compile") + add_definitions(-std=c++14) + endif() endif() if(NOKDESUPPORT) @@ -89,6 +89,7 @@ else() file(APPEND ${PROJECT_BINARY_DIR}/storage_manager.h "\n#define HAS_KWALLET_SUPPORT 0\n") SET(KWALLET_SUPPORT "false") endif() + endif() endif() if(KWALLET_SUPPORT) @@ -120,48 +121,47 @@ if(BUILD_WITH_QT6) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(KWALLET_SUPPORT) - set(MOC_KWALLET lxqt_kwallet.h) - set(KWALLET_COMMON lxqt_kwallet.cpp) - if(SECRET_SUPPORT) - add_library(lxqt-wallet STATIC ${KWALLET_COMMON} lxqt_libsecret.cpp ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${COMMON_MOC_FILES} ${MOC_KWALLET}) - target_link_libraries(lxqt-wallet secretlib) - else() - add_library(lxqt-wallet STATIC ${KWALLET_COMMON} ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${COMMON_MOC_FILES} ${MOC_KWALLET}) - endif() - target_link_libraries(lxqt-wallet KF6::Wallet) + set(MOC_KWALLET lxqt_kwallet.h) + set(KWALLET_COMMON lxqt_kwallet.cpp) + if(SECRET_SUPPORT) + add_library(lxqt-wallet STATIC ${KWALLET_COMMON} lxqt_libsecret.cpp ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${COMMON_MOC_FILES} ${MOC_KWALLET}) + target_link_libraries(lxqt-wallet secretlib) + else() + add_library(lxqt-wallet STATIC ${KWALLET_COMMON} ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${COMMON_MOC_FILES} ${MOC_KWALLET}) + endif() + target_link_libraries(lxqt-wallet KF6::Wallet) else() - set(MOC_KWALLET_DBUS lxqt_kwallet-dbus.h) - set(KWALLET_DBUS lxqt_kwallet-dbus.cpp) - if(SECRET_SUPPORT) - add_library(lxqt-wallet STATIC lxqt_libsecret.cpp ${KWALLET_DBUS} ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${COMMON_MOC_FILES} ${MOC_KWALLET_DBUS}) - target_link_libraries(lxqt-wallet secretlib) - else() - add_library(lxqt-wallet STATIC ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${KWALLET_DBUS} ${COMMON_MOC_FILES} ${MOC_KWALLET_DBUS}) - endif() + set(MOC_KWALLET_DBUS lxqt_kwallet-dbus.h) + set(KWALLET_DBUS lxqt_kwallet-dbus.cpp) + if(SECRET_SUPPORT) + add_library(lxqt-wallet STATIC lxqt_libsecret.cpp ${KWALLET_DBUS} ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${COMMON_MOC_FILES} ${MOC_KWALLET_DBUS}) + target_link_libraries(lxqt-wallet secretlib) + else() + add_library(lxqt-wallet STATIC ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${KWALLET_DBUS} ${COMMON_MOC_FILES} ${MOC_KWALLET_DBUS}) + endif() endif() else() Qt5_WRAP_UI(UI ${COMMON_UI_FILES}) Qt5_WRAP_CPP(MOC ${COMMON_MOC_FILES}) - if(KWALLET_SUPPORT) - Qt5_WRAP_CPP(MOC_KWALLET lxqt_kwallet.h) - set(KWALLET_COMMON lxqt_kwallet.cpp) - if(SECRET_SUPPORT) - add_library(lxqt-wallet STATIC ${KWALLET_COMMON} lxqt_libsecret.cpp ${UI} ${COMMON_SRC_FILES} ${MOC} ${MOC_KWALLET}) - target_link_libraries(lxqt-wallet secretlib) - else() - add_library(lxqt-wallet STATIC ${KWALLET_COMMON} ${UI} ${COMMON_SRC_FILES} ${MOC} ${MOC_KWALLET}) - endif() - target_link_libraries(lxqt-wallet KF5::Wallet) + Qt5_WRAP_CPP(MOC_KWALLET lxqt_kwallet.h) + set(KWALLET_COMMON lxqt_kwallet.cpp) + if(SECRET_SUPPORT) + add_library(lxqt-wallet STATIC ${KWALLET_COMMON} lxqt_libsecret.cpp ${UI} ${COMMON_SRC_FILES} ${MOC} ${MOC_KWALLET}) + target_link_libraries(lxqt-wallet secretlib) + else() + add_library(lxqt-wallet STATIC ${KWALLET_COMMON} ${UI} ${COMMON_SRC_FILES} ${MOC} ${MOC_KWALLET}) + endif() + target_link_libraries(lxqt-wallet KF5::Wallet) else() - Qt5_WRAP_CPP(MOC_KWALLET_DBUS lxqt_kwallet-dbus.h) - set(KWALLET_DBUS lxqt_kwallet-dbus.cpp) - if(SECRET_SUPPORT) - add_library(lxqt-wallet STATIC lxqt_libsecret.cpp ${KWALLET_DBUS} ${UI} ${COMMON_SRC_FILES} ${MOC} ${MOC_KWALLET_DBUS}) - target_link_libraries(lxqt-wallet secretlib) - else() - add_library(lxqt-wallet STATIC ${UI} ${COMMON_SRC_FILES} ${KWALLET_DBUS} ${MOC} ${MOC_KWALLET_DBUS}) - endif() + Qt5_WRAP_CPP(MOC_KWALLET_DBUS lxqt_kwallet-dbus.h) + set(KWALLET_DBUS lxqt_kwallet-dbus.cpp) + if(SECRET_SUPPORT) + add_library(lxqt-wallet STATIC lxqt_libsecret.cpp ${KWALLET_DBUS} ${UI} ${COMMON_SRC_FILES} ${MOC} ${MOC_KWALLET_DBUS}) + target_link_libraries(lxqt-wallet secretlib) + else() + add_library(lxqt-wallet STATIC ${UI} ${COMMON_SRC_FILES} ${KWALLET_DBUS} ${MOC} ${MOC_KWALLET_DBUS}) + endif() endif() endif()