From 243a489060b1c5d4cce843282311feeb826a1665 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 28 Aug 2024 10:01:02 +0200 Subject: [PATCH] qtcreatorcdbext: Forward PythonTargetArchDll in multi-config In setups where no internet is available (Coin CI) we need to specify the path to the python target arch dll. This was done in single configuration mode via the CMake parameter PythonTargetArchDll. But in order to build all architectures we have now: * PythonTargetarm64Dll * PythonTargetwin32Dll * PythonTargetx64Dll And Python3_ROOT_DIR is also forwarded, in order to fix one specific host Python version. Fixes: QTCREATORBUG-31496 Change-Id: I754720f90a4b1fc7d7434ee285c7e300dd77734e Reviewed-by: Eike Ziller --- src/libs/qtcreatorcdbext/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt index b1d77c6c218..9f5e3f4ef49 100644 --- a/src/libs/qtcreatorcdbext/CMakeLists.txt +++ b/src/libs/qtcreatorcdbext/CMakeLists.txt @@ -30,6 +30,8 @@ if (NOT QT_CREATOR_API_DEFINED) CMAKE_GENERATOR_PLATFORM "${arch}" CMAKE_ARGS -D${PROJECT_NAME}-MultiBuild=ON + -DPythonTargetArchDll=${PythonTarget${arch}Dll} + -DPython3_ROOT_DIR=${Python3_ROOT_DIR} BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} INSTALL_COMMAND