diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-10-16 18:04:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-11-03 18:24:46 +0200 |
| commit | 09fdddeb326d0c79d080bdb50a92a839038baea7 (patch) | |
| tree | f74c0f7813f083a12280a2325add73d8dce789c9 /bin | |
| parent | 510cc564c07d41c2eb1689f1928c0b77f652ceb5 (diff) | |
CMake: Don't strip debug builds with qt-cmake-private-install in CI
This provides better stack traces and easier debugging in CI VMs.
Put the MSVC check for disabling stripping into the same place so
there's one location to decide whether stripping should happen.
Amends 60d804c56769de82e658205bec687b83833a61e9
Pick-to: 6.6
Fixes: QTBUG-118070
Change-Id: I4684036c8a5a137d14eea58954b34fe1ceb7f804
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/qt-cmake-private-install.cmake.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bin/qt-cmake-private-install.cmake.in b/bin/qt-cmake-private-install.cmake.in index 19dddd4fcb..71a94e190d 100644 --- a/bin/qt-cmake-private-install.cmake.in +++ b/bin/qt-cmake-private-install.cmake.in @@ -5,13 +5,18 @@ # 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}) |