From eda1e4b84fb537e96c9e0ae96811816d2f36b418 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 8 Nov 2024 15:48:24 +0100 Subject: [PATCH] CMake: Fix CMP0177 warnings CMake 3.31 introduced CMP0177 that warns if an install destination is a not-normalized path. Fix this by normalizing the offending paths before using them. Change-Id: I1586bf192a4fd26108aa0448431f19e69df8aacd Reviewed-by: Alexey Edelev (cherry picked from commit 14fc7f0852903109fed8357e2df9edc851f31b65) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtModuleHelpers.cmake | 3 +++ src/corelib/CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index f976833d359..fec07c6dc8e 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -766,6 +766,9 @@ set(QT_ALLOW_MISSING_TOOLS_PACKAGES TRUE)") set(args "") if(QT_WILL_INSTALL) set(metatypes_install_dir "${INSTALL_ARCHDATADIR}/metatypes") + if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.31") + cmake_path(SET metatypes_install_dir NORMALIZE "${metatypes_install_dir}") + endif() list(APPEND args __QT_INTERNAL_INSTALL __QT_INTERNAL_INSTALL_DIR "${metatypes_install_dir}") endif() diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index aa940a3d26a..e8d7320c0bf 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -412,6 +412,9 @@ set(core_metatype_args MANUAL_MOC_JSON_FILES ${core_qobject_metatypes_json_list} if(QT_WILL_INSTALL) set(metatypes_install_dir ${INSTALL_ARCHDATADIR}/metatypes) + if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.31") + cmake_path(SET metatypes_install_dir NORMALIZE "${metatypes_install_dir}") + endif() list(APPEND core_metatype_args __QT_INTERNAL_INSTALL __QT_INTERNAL_INSTALL_DIR "${metatypes_install_dir}") endif()