diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-03 10:59:45 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-08 14:49:53 +0200 |
| commit | ea9b4b59824a5a36fea854d2486fd2e59d15b049 (patch) | |
| tree | 0f890bf4e9ba89a8402216b8fdbabb5bb52cf676 /cmake | |
| parent | 974f23933838515d840361cdd4ed1d791b14250c (diff) | |
CMake: Do not create Qt6ToolsConfig[Version].cmake files
They are not necessary, and they conflict with what qttools generates.
Fixes: QTBUG-82133
Change-Id: I4a1273d694626345b32b45c653dd31d3b78621eb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 19 | ||||
| -rw-r--r-- | cmake/QtToolsConfig.cmake.in | 35 |
2 files changed, 0 insertions, 54 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 5e97f0e66b..a642b08a10 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -52,18 +52,6 @@ write_basic_package_version_file( COMPATIBILITY AnyNewerVersion ) -# Generate and install Qt6Tools config file. -configure_package_config_file( - "${PROJECT_SOURCE_DIR}/cmake/QtToolsConfig.cmake.in" - "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfig.cmake" - INSTALL_DESTINATION "${__GlobalConfig_install_dir}" -) -write_basic_package_version_file( - ${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfigVersion.cmake - VERSION ${PROJECT_VERSION} - COMPATIBILITY AnyNewerVersion -) - qt_install(FILES "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}Config.cmake" "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ConfigVersion.cmake" @@ -71,13 +59,6 @@ qt_install(FILES COMPONENT Devel ) -qt_install(FILES - "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfig.cmake" - "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfigVersion.cmake" - DESTINATION "${__GlobalConfig_install_dir}Tools" - COMPONENT Devel -) - # Configure and install the QtBuildInternals package. set(__build_internals_path_suffix "${INSTALL_CMAKE_NAMESPACE}BuildInternals") qt_path_join(__build_internals_build_dir ${QT_CONFIG_BUILD_DIR} ${__build_internals_path_suffix}) diff --git a/cmake/QtToolsConfig.cmake.in b/cmake/QtToolsConfig.cmake.in deleted file mode 100644 index 7b2fa1de74..0000000000 --- a/cmake/QtToolsConfig.cmake.in +++ /dev/null @@ -1,35 +0,0 @@ -@PACKAGE_INIT@ - -get_filename_component(_qt_tools_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE) - - if (NOT @INSTALL_CMAKE_NAMESPACE@Tools_FIND_COMPONENTS) - set(@INSTALL_CMAKE_NAMESPACE@Tools_NOT_FOUND_MESSAGE - "The Qt tools package requires at least one component.") - set(@INSTALL_CMAKE_NAMESPACE@Tools_FOUND False) - return() - endif() - -foreach(module ${@INSTALL_CMAKE_NAMESPACE@Tools_FIND_COMPONENTS}) - find_package(@INSTALL_CMAKE_NAMESPACE@${module}Tools - ${_@INSTALL_CMAKE_NAMESPACE@Tools_FIND_PARTS_QUIET} - ${_@INSTALL_CMAKE_NAMESPACE@Tools_FIND_PARTS_REQUIRED} - PATHS ${_qt_tools_cmake_dir} NO_DEFAULT_PATH - ) - if (NOT @INSTALL_CMAKE_NAMESPACE@${module}Tools_FOUND) - string(CONFIGURE ${_qt5_module_location_template} _expected_module_location @ONLY) - - if (@INSTALL_CMAKE_NAMESPACE@_FIND_REQUIRED_${module}) - set(_Qt_NOTFOUND_MESSAGE - "${_Qt_NOTFOUND_MESSAGE}Failed to find Qt component \"${module}\" config file.") - elseif(NOT Qt_FIND_QUIETLY) - message(WARNING "Failed to find Qt component \"${module}\" config file.") - endif() - - unset(_expected_module_location) - endif() -endforeach() - -if (_Qt_NOTFOUND_MESSAGE) - set(@INSTALL_CMAKE_NAMESPACE@Tools_NOT_FOUND_MESSAGE "${_Qt_NOTFOUND_MESSAGE}") - set(@INSTALL_CMAKE_NAMESPACE@Tools_FOUND False) -endif() |