Skip to content

Commit 5ae11c4

Browse files
author
Michal Klocek
committed
Enable WoM cross compilation
Support cross compilation for WoA to enable binary releases. We do not support native compilation as this is way to slow, however binaries can be released from cross compilation target. Moreover interrogated change for switching dependency for host_qt to mingw for msvc22 cross compile target reduces further the overall integration time. Note the testing is done on native window arm64. This setup is a bit hackish but seems to do the job. Task-number: COIN-1211 Pick-to: 6.9 Change-Id: I0d3a715cad2b69dec8eea66d9e79da8abf705ce1 Reviewed-by: Allan Sandfeld Jensen <[email protected]>
1 parent 39da243 commit 5ae11c4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

coin.nodes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ windows-10_22h2-msvc2022 ON ON
3737
windows-10_22h2-mingw13 OFF ON
3838
windows-11_22h2-arm64-msvc2022 OFF ON
3939
windows-11_23H2-llvm OFF ON
40-
windows-11_23H2-msvc2022-arm64 OFF ON
40+
windows-11_23H2-msvc2022-arm64 ON ON
4141
windows-11_23H2-msvc2022 ON ON
4242
windows-11_23H2-msvc2022-developer-build ON ON
4343
windows-11_23H2-mingw13-developer-build OFF ON

configure.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,16 +288,16 @@ endforeach()
288288
unset(targets_to_check)
289289

290290
if(WIN32 AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR
291-
CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64" OR
292-
CMAKE_CROSSCOMPILING))
291+
CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64"))
293292
set(WIN_ARM_64 ON)
294293
else()
295294
set(WIN_ARM_64 OFF)
296295
endif()
297296

298297
qt_webengine_configure_check("supported-platform"
299298
MODULES QtWebEngine
300-
CONDITION LINUX OR (WIN32 AND NOT (WIN_ARM_64 AND DEFINED ENV{COIN_PLATFORM_ID})) OR MACOS
299+
CONDITION LINUX OR (WIN32 AND CMAKE_CROSSCOMPILING) OR
300+
(WIN32 AND NOT (WIN_ARM_64 AND DEFINED ENV{COIN_PLATFORM_ID})) OR MACOS
301301
MESSAGE "Build can be done only on Linux, Windows or macOS."
302302
)
303303
qt_webengine_configure_check("supported-platform"

0 commit comments

Comments
 (0)