archive/mumble-voip_mumble
0
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-03-17 22:12:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge PR : BUILD: Auto-determine Windows xcompile triplet

Browse source
This commit is contained in:
Robert Adam 2024-01-01 12:43:05 +01:00 committed by GitHub
commit f07bdb8df6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions

7
overlay/CMakeLists.txt
View file

@ -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}"