Merge pull request #1 from hrittich/upstream-patches
Allow to find packages in namespaces
This commit is contained in:
commit
7db709aa6f
|
@ -25,9 +25,15 @@ set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES
|
||||||
set(CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME
|
set(CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME
|
||||||
"${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}"
|
"${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}"
|
||||||
CACHE STRING "sets the suffix for qtforkawesome")
|
CACHE STRING "sets the suffix for qtforkawesome")
|
||||||
find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.5.0 REQUIRED)
|
set(PACKAGE_NAMESPACE
|
||||||
find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.3.0 REQUIRED)
|
""
|
||||||
|
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})
|
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)
|
add_subdirectory(iconengineplugin)
|
||||||
|
|
|
@ -13,8 +13,12 @@ set(SRC_FILES iconengine.cpp main.cpp)
|
||||||
use_cpp_utilities(ONLY_HEADERS VISIBILITY PUBLIC)
|
use_cpp_utilities(ONLY_HEADERS VISIBILITY PUBLIC)
|
||||||
use_qt_utilities(ONLY_HEADERS VISIBILITY PRIVATE)
|
use_qt_utilities(ONLY_HEADERS VISIBILITY PRIVATE)
|
||||||
|
|
||||||
|
if (NAMESPACE)
|
||||||
|
set(NAMESPACE_PREFIX "${NAMESPACE}-")
|
||||||
|
endif ()
|
||||||
|
|
||||||
# use main qtforkawesome library
|
# 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_fork_awesome()
|
||||||
|
|
||||||
# use Qt Gui module
|
# use Qt Gui module
|
||||||
|
|
Loading…
Reference in New Issue