feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qtcreatorcdbext: Forward PythonTargetArchDll in multi-config

Browse Source 
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 <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2024-08-28 10:01:02 +02:00
parent 25fcbb3361
commit 243a489060
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qtcreatorcdbext/CMakeLists.txt
View File

@@ -30,6 +30,8 @@ if (NOT QT_CREATOR_API_DEFINED)
CMAKE_GENERATOR_PLATFORM "${arch}" CMAKE_GENERATOR_PLATFORM "${arch}"
CMAKE_ARGS CMAKE_ARGS
-D${PROJECT_NAME}-MultiBuild=ON -D${PROJECT_NAME}-MultiBuild=ON
-DPythonTargetArchDll=${PythonTarget${arch}Dll}
-DPython3_ROOT_DIR=${Python3_ROOT_DIR}
BUILD_COMMAND BUILD_COMMAND
${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
INSTALL_COMMAND INSTALL_COMMAND