From 5b2f1f8969d2af33cbea302f3ea057d4093e126c Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Wed, 14 Dec 2022 20:32:13 +0300 Subject: [PATCH] processing of 3rdparty libraries moved to a separate cmake file --- client/CMakeLists.txt | 22 +--------------------- client/cmake/3rdparty.cmake | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 client/cmake/3rdparty.cmake diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index fbc6c876..0d6d32fc 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -45,32 +45,12 @@ if(IS_CI) endif() endif() -include(${CMAKE_CURRENT_LIST_DIR}/3rd/QtSsh/src/ssh/qssh.cmake) - -include(${CMAKE_CURRENT_LIST_DIR}/3rd/QtSsh/src/botan/botan.cmake) -if(NOT IOS AND NOT ANDROID) - include(${CMAKE_CURRENT_LIST_DIR}/3rd/SingleApplication/singleapplication.cmake) -endif() - -add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/SortFilterProxyModel) -set(LIBS ${LIBS} SortFilterProxyModel) - -include(${CMAKE_CURRENT_LIST_DIR}/3rd/qrcodegen/qrcodegen.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/QSimpleCrypto.cmake) - -set(BUILD_WITH_QT6 ON) -set(BUILD_SHARED_LIBS OFF) -add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain) -set(LIBS ${LIBS} qt6keychain) +include(${CMAKE_CURRENT_LIST_DIR}/cmake/3rdparty.cmake) include_directories( - ${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/include - ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include ${CMAKE_CURRENT_LIST_DIR}/../ipc - ${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/3rd/qtkeychain ) set(HEADERS ${HEADERS} diff --git a/client/cmake/3rdparty.cmake b/client/cmake/3rdparty.cmake new file mode 100644 index 00000000..2fcfa9d1 --- /dev/null +++ b/client/cmake/3rdparty.cmake @@ -0,0 +1,26 @@ +set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..) + +include(${CLIENT_ROOT_DIR}/3rd/QtSsh/src/ssh/qssh.cmake) + +include(${CLIENT_ROOT_DIR}/3rd/QtSsh/src/botan/botan.cmake) +if(NOT IOS AND NOT ANDROID) + include(${CLIENT_ROOT_DIR}/3rd/SingleApplication/singleapplication.cmake) +endif() + +add_subdirectory(${CLIENT_ROOT_DIR}/3rd/SortFilterProxyModel) +set(LIBS ${LIBS} SortFilterProxyModel) + +include(${CLIENT_ROOT_DIR}/3rd/qrcodegen/qrcodegen.cmake) +include(${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/QSimpleCrypto.cmake) + +set(BUILD_WITH_QT6 ON) +set(BUILD_SHARED_LIBS OFF) +add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtkeychain) +set(LIBS ${LIBS} qt6keychain) + +include_directories( + ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/include + ${CLIENT_ROOT_DIR}/3rd/OpenSSL/include + ${CLIENT_ROOT_DIR}/3rd/qtkeychain + ${CMAKE_CURRENT_BINARY_DIR}/3rd/qtkeychain +)