From b8e9f786b7b68e342f64320554f66d4c273e31b6 Mon Sep 17 00:00:00 2001 From: Hannah Rittich Date: Sun, 3 Oct 2021 19:18:43 +0200 Subject: [PATCH] Allow to find packages in namespaces --- CMakeLists.txt | 12 +++++++++--- iconengineplugin/CMakeLists.txt | 6 +++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27ff402..39e0c0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,9 +25,15 @@ set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES set(CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME "${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}" CACHE STRING "sets the suffix for qtforkawesome") -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.5.0 REQUIRED) -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED) +set(PACKAGE_NAMESPACE + "" + CACHE STRING "sets the namespace (prefix) for find_package() calls to packages configured via c++utilities") +if (PACKAGE_NAMESPACE) + set(PACKAGE_NAMESPACE_PREFIX "${PACKAGE_NAMESPACE}-") +endif () +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.5.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED) add_subdirectory(${META_PROJECT_NAME}) -set(${META_PROJECT_NAME}${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME}_DIR "${CMAKE_CURRENT_BINARY_DIR}/${META_PROJECT_NAME}") +set(${PACKAGE_NAMESPACE_PREFIX}${META_PROJECT_NAME}${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME}_DIR "${CMAKE_CURRENT_BINARY_DIR}/${META_PROJECT_NAME}") add_subdirectory(iconengineplugin) diff --git a/iconengineplugin/CMakeLists.txt b/iconengineplugin/CMakeLists.txt index bb484f7..15b9033 100644 --- a/iconengineplugin/CMakeLists.txt +++ b/iconengineplugin/CMakeLists.txt @@ -13,8 +13,12 @@ set(SRC_FILES iconengine.cpp main.cpp) use_cpp_utilities(ONLY_HEADERS VISIBILITY PUBLIC) use_qt_utilities(ONLY_HEADERS VISIBILITY PRIVATE) +if (NAMESPACE) + set(NAMESPACE_PREFIX "${NAMESPACE}-") +endif () + # use main qtforkawesome library -find_package(qtforkawesome${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} ${META_APP_VERSION} REQUIRED) +find_package(${NAMESPACE_PREFIX}qtforkawesome${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} ${META_APP_VERSION} REQUIRED) use_qt_fork_awesome() # use Qt Gui module