diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt index 17ce52e9a..2f3dc8814 100644 --- a/overlay/CMakeLists.txt +++ b/overlay/CMakeLists.txt @@ -149,13 +149,16 @@ endif() if(64_BIT AND MSVC) include(ExternalProject) + + string(REPLACE "x64" "x86" XCOMPILE_TRIPLET "${VCPKG_TARGET_TRIPLET}") + message(STATUS "Using cross-compilation triplet '${XCOMPILE_TRIPLET}'") if(CMAKE_GENERATOR MATCHES "Visual Studio") ExternalProject_Add(overlay_xcompile DOWNLOAD_COMMAND "" CMAKE_GENERATOR ${CMAKE_GENERATOR} CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - "-DVCPKG_TARGET_TRIPLET=x86-windows-static-md" + "-DVCPKG_TARGET_TRIPLET=${XCOMPILE_TRIPLET}" "-DMUMBLE_SOURCE_ROOT=${CMAKE_SOURCE_DIR}" "-DMUMBLE_BINARY_DIR=${CMAKE_BINARY_DIR}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" @@ -177,7 +180,7 @@ if(64_BIT AND MSVC) BUILD_COMMAND ${CMAKE_SOURCE_DIR}/overlay/scripts/build_overlay_xcompile.cmd -G ${CMAKE_GENERATOR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - "-DVCPKG_TARGET_TRIPLET=x86-windows-static-md" + "-DVCPKG_TARGET_TRIPLET=${XCOMPILE_TRIPLET}" "-DMUMBLE_SOURCE_ROOT=${CMAKE_SOURCE_DIR}" "-DMUMBLE_BINARY_DIR=${CMAKE_BINARY_DIR}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"