diff --git a/CMakeLists.txt b/CMakeLists.txt index 78021b3..2f0200f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ option(NO_PLASMOID "whether building the Plasma 5 plasmoid should be skipped" "$ # allow using non-default configuration set(CONFIGURATION_PACKAGE_SUFFIX "" CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities") +set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES "${CONFIGURATION_PACKAGE_SUFFIX}" CACHE STRING "sets the suffix for qtutilities") # add subdirectories enable_testing() diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index e83d218..106fde0 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -18,7 +18,7 @@ find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.0.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS}) list(APPEND PRIVATE_INCLUDE_DIRS ${QT_UTILITIES_INCLUDE_DIRS}) diff --git a/connector/CMakeLists.txt b/connector/CMakeLists.txt index 2d6356c..0800674 100644 --- a/connector/CMakeLists.txt +++ b/connector/CMakeLists.txt @@ -45,7 +45,7 @@ find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities(VISIBILITY PUBLIC) # find qtutilities (only headers and CMake modules used) -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.3.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS}) list(APPEND PUBLIC_INCLUDE_DIRS ${QT_UTILITIES_INCLUDE_DIRS}) diff --git a/model/CMakeLists.txt b/model/CMakeLists.txt index 70503c5..bce785f 100644 --- a/model/CMakeLists.txt +++ b/model/CMakeLists.txt @@ -38,7 +38,7 @@ find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities (only CMake modules used) -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.3.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED) use_qt_utilities() # find backend libraries diff --git a/testhelper/CMakeLists.txt b/testhelper/CMakeLists.txt index 462fb97..ab77207 100644 --- a/testhelper/CMakeLists.txt +++ b/testhelper/CMakeLists.txt @@ -28,7 +28,7 @@ find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities (only CMake modules used) -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.0.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS}) # find syncthingconnector diff --git a/tray/CMakeLists.txt b/tray/CMakeLists.txt index eafd081..eed7681 100644 --- a/tray/CMakeLists.txt +++ b/tray/CMakeLists.txt @@ -98,7 +98,7 @@ find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.6.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.0.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED) use_qt_utilities() # find backend libraries diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt index bbb9327..1a6bc38 100644 --- a/widgets/CMakeLists.txt +++ b/widgets/CMakeLists.txt @@ -76,7 +76,7 @@ find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.3.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED) use_qt_utilities() # find backend libraries