diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:35:07 +0100 |
commit | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (patch) | |
tree | c9d6c1d1fe90dba3c788fd06795cf05a6d4ed5bb /cmake/QtModuleConfig.cmake.in | |
parent | 71436d5499a9e0355f778f47ef465486a727049d (diff) | |
parent | c431e2d33c2b13dee8b43a08c267c20ec1ae9654 (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
Diffstat (limited to 'cmake/QtModuleConfig.cmake.in')
-rw-r--r-- | cmake/QtModuleConfig.cmake.in | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in index 58a84fb5d5..b2e1511870 100644 --- a/cmake/QtModuleConfig.cmake.in +++ b/cmake/QtModuleConfig.cmake.in @@ -45,24 +45,9 @@ if(NOT _qt_module_target_type STREQUAL "INTERFACE_LIBRARY") endif() endif() -# Apply meta types properties -if (@QT_MODULE_HAS_META_TYPES_FILE@) - if (NOT QT_NO_CREATE_TARGETS) - set_target_properties("@INSTALL_CMAKE_NAMESPACE@::@target@" PROPERTIES - INTERFACE_QT_MODULE_HAS_META_TYPES TRUE - INTERFACE_QT_META_TYPES_INSTALL_FILE "@QT_MODULE_META_TYPES_FILE@" - INTERFACE_QT_META_TYPES_INSTALL_DEP_FILE "@QT_MODULE_META_TYPES_DEP_FILE@" - ) - endif() - if (NOT QT_NO_CREATE_VERSIONLESS_TARGETS) - get_target_property(is_alias_target "Qt::@target@" ALIASED_TARGET) - if (NOT is_alias_target) - set_target_properties("Qt::@target@" PROPERTIES - INTERFACE_QT_MODULE_HAS_META_TYPES TRUE - INTERFACE_QT_META_TYPES_INSTALL_FILE "@QT_MODULE_META_TYPES_FILE@" - INTERFACE_QT_META_TYPES_INSTALL_DEP_FILE "@QT_MODULE_META_TYPES_DEP_FILE@" - ) - endif() - endif() +# Load Module's BuildIntenals should any exist +if (@INSTALL_CMAKE_NAMESPACE@BuildInternals_DIR AND + EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@BuildInternals.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@BuildInternals.cmake") endif() |