From 7fdfc2ac1df3c7d1ff5d19ad76ac0fe65bcb661c Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 9 Jan 2024 12:59:44 +0100 Subject: [PATCH] Auto-Setup: Forward CMAKE_MSVC_RUNTIME_LIBRARY to package manager Fixes: QTCREATORBUG-30169 Change-Id: Icfbb497e067c5a5a4b57e91c9fa50bc0a2816bc3 Reviewed-by: Alessandro Portale --- src/share/3rdparty/package-manager/auto-setup.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake index 2b14e4ae2b9..a2e30686f9f 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -32,10 +32,11 @@ macro(qtc_auto_setup_compiler_standard toolchainFile) endforeach() endforeach() - foreach(osx_var CMAKE_SYSROOT CMAKE_OSX_SYSROOT CMAKE_OSX_ARCHITECTURES) - if (${osx_var}) + # Forward important CMake variables to the package manager in the toolchain file + foreach(fwd_var CMAKE_MSVC_RUNTIME_LIBRARY CMAKE_SYSROOT CMAKE_OSX_SYSROOT CMAKE_OSX_ARCHITECTURES) + if (${fwd_var}) file(APPEND "${toolchainFile}" - "set(${osx_var} ${${osx_var}})\n") + "set(${fwd_var} ${${fwd_var}})\n") endif() endforeach() endmacro()