diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f00736..c6761e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,8 +47,8 @@ if(NOT BUNDLED_QT_FORK_AWESOME_PATH) else() if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${BUNDLED_QT_FORK_AWESOME_PATH}" OR IS_DIRECTORY "${BUNDLED_QT_FORK_AWESOME_PATH}") add_subdirectory("${BUNDLED_QT_FORK_AWESOME_PATH}" qtforkawesome) - set(qtforkawesome${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtforkawesome/qtforkawesome") - set(qtforkawesomeiconengine${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtforkawesome/iconengineplugin") + set(${NAMESPACE_PREFIX}qtforkawesome${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtforkawesome/qtforkawesome") + set(${NAMESPACE_PREFIX}qtforkawesomeiconengine${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtforkawesome/iconengineplugin") else() message(FATAL_ERROR "Specified directory for qtforkawesome sources \"${BUNDLED_QT_FORK_AWESOME_PATH}\" does not exist.") endif() @@ -57,6 +57,11 @@ endif() # set the include directory used when building so the headers of the different backend libraries can be found at build time set(TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") +set(PACKAGE_NAMESPACE "" CACHE STRING "sets the prefix for find_package() calls to packages configured via c++utilities") +if (PACKAGE_NAMESPACE) + set(PACKAGE_NAMESPACE_PREFIX "${PACKAGE_NAMESPACE}-") +endif () + # add subdirectories add_subdirectory(connector) add_subdirectory(testhelper) diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index 1215394..650a81f 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -14,11 +14,11 @@ set(TEST_HEADER_FILES) set(TEST_SRC_FILES tests/application.cpp) # find c++utilities -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.10.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.10.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED) use_qt_utilities(ONLY_HEADERS VISIBILITY PUBLIC) # find backend libraries diff --git a/connector/CMakeLists.txt b/connector/CMakeLists.txt index 256b40c..ee57cb5 100644 --- a/connector/CMakeLists.txt +++ b/connector/CMakeLists.txt @@ -41,11 +41,11 @@ set(TS_FILES translations/${META_PROJECT_NAME}_cs_CZ.ts translations/${META_PROJ translations/${META_PROJECT_NAME}_en_US.ts) # find c++utilities -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.10.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.10.0 REQUIRED) use_cpp_utilities(VISIBILITY PUBLIC) # find qtutilities (only headers and CMake modules used) -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED) use_qt_utilities(ONLY_HEADERS VISIBILITY PUBLIC) # find boost libraries diff --git a/fileitemactionplugin/CMakeLists.txt b/fileitemactionplugin/CMakeLists.txt index 22f9e33..aeee12c 100644 --- a/fileitemactionplugin/CMakeLists.txt +++ b/fileitemactionplugin/CMakeLists.txt @@ -15,11 +15,11 @@ set(TS_FILES translations/${META_PROJECT_NAME}_cs_CZ.ts translations/${META_PROJ translations/${META_PROJECT_NAME}_en_US.ts) # find c++utilities -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_MODULE_DIRS}) # find qtutilities -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED) use_qt_utilities() # find backend libraries diff --git a/libsyncthing/CMakeLists.txt b/libsyncthing/CMakeLists.txt index ef99d3f..7c3bd0c 100644 --- a/libsyncthing/CMakeLists.txt +++ b/libsyncthing/CMakeLists.txt @@ -193,7 +193,7 @@ add_custom_target( COMMENT "Building Syncthing itself (as executable, ${SYNCTHING_EXECUTABLE_PATH})") # find c++utilities to use CMake modules and headers from it privately -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_MODULE_DIRS}) if (CPP_UTILITIES_SOURCE_DIR) list(APPEND PRIVATE_INCLUDE_DIRS $ diff --git a/model/CMakeLists.txt b/model/CMakeLists.txt index 19c2b1a..5f5fe41 100644 --- a/model/CMakeLists.txt +++ b/model/CMakeLists.txt @@ -36,11 +36,11 @@ set(TS_FILES translations/${META_PROJECT_NAME}_cs_CZ.ts translations/${META_PROJ translations/${META_PROJECT_NAME}_en_US.ts) # find c++utilities -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities (only CMake modules used) -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED) use_qt_utilities() # find backend libraries @@ -48,7 +48,7 @@ find_package(syncthingconnector ${META_APP_VERSION} REQUIRED) use_syncthingconnector(VISIBILITY PUBLIC) # find qtforkawesome -find_package(qtforkawesome${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} 0.0.1 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}qtforkawesome${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} 0.0.1 REQUIRED) use_qt_fork_awesome(VISIBILITY PUBLIC) # link also explicitly against the following Qt modules diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt index afee7be..12e0d26 100644 --- a/plasmoid/CMakeLists.txt +++ b/plasmoid/CMakeLists.txt @@ -35,7 +35,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PA find_package(KF5Plasma REQUIRED) # find c++utilities -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_MODULE_DIRS}) # prepare plasmoid package/configuration diff --git a/plasmoid/lib/CMakeLists.txt b/plasmoid/lib/CMakeLists.txt index a8c7566..efcbdc9 100644 --- a/plasmoid/lib/CMakeLists.txt +++ b/plasmoid/lib/CMakeLists.txt @@ -8,7 +8,7 @@ endforeach () set(TS_FILES ../translations/${META_PROJECT_NAME}_de_DE.ts ../translations/${META_PROJECT_NAME}_en_US.ts) # find qtutilities -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.2.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.2.0 REQUIRED) use_qt_utilities() # check whether qtutilities supports DBus notifications diff --git a/testhelper/CMakeLists.txt b/testhelper/CMakeLists.txt index 3dd5ca1..a24a83d 100644 --- a/testhelper/CMakeLists.txt +++ b/testhelper/CMakeLists.txt @@ -24,11 +24,11 @@ set(TS_FILES) set(SYNCTHINGTESTHELPER_CONFIGURATION_TARGET_SUFFIX none) # find c++utilities -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities (only CMake modules used) -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}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 ac55eba..62bf9c8 100644 --- a/tray/CMakeLists.txt +++ b/tray/CMakeLists.txt @@ -96,11 +96,11 @@ set(REQUIRED_ICONS window-close) # find c++utilities -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.6.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.6.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.4.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.4.0 REQUIRED) use_qt_utilities() # find backend libraries @@ -114,7 +114,7 @@ use_syncthingwidgets() # link against the qtforkawesomeiconengine plugin when static linkage is enabled include(3rdParty) if (STATIC_LINKAGE) - find_package(qtforkawesomeiconengine${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} 0.0.1 REQUIRED) + find_package(${PACKAGE_NAMESPACE_PREFIX}qtforkawesomeiconengine${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} 0.0.1 REQUIRED) use_qt_fork_awesome_icon_engine() endif () diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt index d59fecb..8cb7dce 100644 --- a/widgets/CMakeLists.txt +++ b/widgets/CMakeLists.txt @@ -74,11 +74,11 @@ set(REQUIRED_ICONS go-up) # find c++utilities -find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.11.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.11.0 REQUIRED) use_cpp_utilities(VISIBILITY PUBLIC) # find qtutilities -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.5.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.5.0 REQUIRED) use_qt_utilities() # find backend libraries