From 08a4a7ea0957d487f3e82a27052aea44ffa9f3c1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 7 Aug 2021 18:41:22 +0200 Subject: [PATCH] =?UTF-8?q?Make=20it=20work=20with=20`CONFIGURATION=5FPACK?= =?UTF-8?q?AGE=5FSUFFIX=E2=80=A6`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- syncthingtray/CMakeLists.txt | 5 +++++ tageditor/CMakeLists.txt | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/syncthingtray/CMakeLists.txt b/syncthingtray/CMakeLists.txt index cad0c9b..d25f9e9 100644 --- a/syncthingtray/CMakeLists.txt +++ b/syncthingtray/CMakeLists.txt @@ -6,12 +6,17 @@ enable_testing() set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) +message(STATUS "Adding c++utilities subdir") add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities) +set(c++utilities${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/c++utilities") list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules) link_directories(${CPP_UTILITIES_BINARY_DIR}) +message(STATUS "Adding qtutilities subdir") add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities) +set(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtutilities") list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules) link_directories(${QT_UTILITIES_BINARY_DIR}) +message(STATUS "Adding syncthingtray subdir") add_subdirectory(${SUBDIRS_PREFIX}/syncthingtray syncthingtray) diff --git a/tageditor/CMakeLists.txt b/tageditor/CMakeLists.txt index e3ddd19..a6047e1 100644 --- a/tageditor/CMakeLists.txt +++ b/tageditor/CMakeLists.txt @@ -7,6 +7,7 @@ enable_testing() set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities) +set(c++utilities${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/c++utilities") list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules) link_directories(${CPP_UTILITIES_BINARY_DIR}) @@ -14,6 +15,7 @@ option(WIDGETS_GUI "enables/disables building the Qt Widgets GUI: yes (default) option(QUICK_GUI "enables/disables building the Qt Quick GUI: yes (default) or no" ON) if(WIDGETS_GUI OR QUICK_GUI) add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities) + set(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtutilities") list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules) link_directories(${QT_UTILITIES_BINARY_DIR}) endif() @@ -21,11 +23,13 @@ endif() option(ENABLE_JSON_EXPORT "enable JSON export" OFF) if(ENABLE_JSON_EXPORT) add_subdirectory(${SUBDIRS_PREFIX}/reflective-rapidjson reflective-rapidjson) + set(reflective-rapidjson${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/reflective-rapidjson") list(APPEND CMAKE_MODULE_PATH ${REFLECTIVE_RAPIDJSON_SOURCE_DIR}/cmake/modules) link_directories(${REFLECTIVE_RAPIDJSON_BINARY_DIR}) endif() add_subdirectory(${SUBDIRS_PREFIX}/tagparser tagparser) +set(tagparser${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/tagparser") link_directories(${TAG_PARSER_BINARY_DIR}) add_subdirectory(${SUBDIRS_PREFIX}/tageditor tageditor)