summaryrefslogtreecommitdiffstats
path: root/bin/qt-cmake-private-install.cmake.in
diff options
context:
space:
mode:
Diffstat (limited to 'bin/qt-cmake-private-install.cmake.in')
-rw-r--r--bin/qt-cmake-private-install.cmake.in14
1 files changed, 10 insertions, 4 deletions
diff --git a/bin/qt-cmake-private-install.cmake.in b/bin/qt-cmake-private-install.cmake.in
index 845394d02e..71a94e190d 100644
--- a/bin/qt-cmake-private-install.cmake.in
+++ b/bin/qt-cmake-private-install.cmake.in
@@ -1,16 +1,22 @@
# Calls cmake --install ${QT_BUILD_DIR} --config <config> for each config
# with which Qt was built with.
# This is required to enable installation of all configurations of
-# a Qt built with Ninja Multi-Config until the following issue is fixed.
+# a Qt built with Ninja Multi-Config until the following issues are fixed:
# https://gitlab.kitware.com/cmake/cmake/-/issues/20713
+# https://gitlab.kitware.com/cmake/cmake/-/issues/21475
set(configs "@__qt_configured_configs@")
+set(should_skip_strip "@__qt_skip_strip_installed_artifacts@")
+
if(NOT QT_BUILD_DIR)
message(FATAL_ERROR "No QT_BUILD_DIR value provided to qt-cmake-private-install.")
endif()
-unset(strip_arg)
-if ("x@MSVC@" STREQUAL "x")
- set(strip_arg --strip)
+
+if(should_skip_strip)
+ unset(strip_arg)
+else()
+ set(strip_arg --strip)
endif()
+
foreach(config ${configs})
message(STATUS "Installing configuration: '${config}'")
set(args "${CMAKE_COMMAND}" --install ${QT_BUILD_DIR} --config "${config}" ${strip_arg})