diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-03-09 14:29:47 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-03-10 10:56:44 +0200 |
| commit | f196b7eba15e7d39a69c74a2f50a19c0c450637a (patch) | |
| tree | 2c1304d0e4418ce92c0d413689e5242f50a19c2e | |
| parent | 9eeec130ae82e95a0670da0b9abc66c865e117ca (diff) | |
qbsp: update cmake configs for the toolchain registration
Keep QtCreator happy and warning free by adding the default
CMake configuration that would be there if we didn't add
any of our own and use the correct toolchain file.
Pick-to: 6.3 6.2
Change-Id: I5d3831837a818761076b6047009b9ed4ffa91683
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rwxr-xr-x | meta-boot2qt/files/configure-qtcreator.sh | 4 | ||||
| -rw-r--r-- | meta-boot2qt/files/qbsp/toolchain_installscript.qs | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh index 2810ba5d..081ac89e 100755 --- a/meta-boot2qt/files/configure-qtcreator.sh +++ b/meta-boot2qt/files/configure-qtcreator.sh @@ -149,9 +149,11 @@ ${SDKTOOL} addKit \ --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \ --mkspec "${MKSPEC}" \ --cmake "${BASEID}.cmake" \ + --cmake-config "CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}" \ + --cmake-config "CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}" \ --cmake-config "CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}" \ --cmake-config "QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}" \ - --cmake-config "CMAKE_TOOLCHAIN_FILE:FILEPATH=${OECORE_NATIVE_SYSROOT}/usr/share/cmake/Qt6Toolchain.cmake" \ + --cmake-config "CMAKE_TOOLCHAIN_FILE:FILEPATH=${OECORE_NATIVE_SYSROOT}/usr/lib/cmake/Qt6/qt.toolchain.cmake" \ --cmake-config "CMAKE_MAKE_PROGRAM:FILEPATH=$(type -p ninja)" \ --cmake-generator "Ninja" diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index a99040d6..374650e4 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -134,12 +134,15 @@ Component.prototype.createOperations = function() "--icon", icon, "--cmake", cmakeId, "--cmake-generator", "Ninja", + "--cmake-config", "CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}", + "--cmake-config", "CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}", + "--cmake-config", "CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}", + "--cmake-config", "QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}", "--cmake-config", "CMAKE_TOOLCHAIN_FILE:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/lib/cmake/Qt6/qt.toolchain.cmake", "--cmake-config", "CMAKE_MAKE_PROGRAM:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/ninja" + executableExt]; if (systemInfo.kernelType === "winnt") { addKitOperations.push("--cmake-config", "CMAKE_BUILD_WITH_INSTALL_RPATH=ON"); - addKitOperations.push("--env", "SDKPATH=" + path); } addKitOperations.push("UNDOEXECUTE", "@SDKToolBinary@", "rmKit", "--id", basecomponent); |