diff options
| author | Septarius <1136966+Septarius@users.noreply.github.com> | 2020-06-06 09:31:10 +0300 |
|---|---|---|
| committer | Davide Beatrici <git@davidebeatrici.dev> | 2020-07-11 20:37:21 +0300 |
| commit | c82d3aa4196e6d2605dbac9b44796465800af48b (patch) | |
| tree | 0f96464652fc66b57ecccf39239dbf22b909768e /overlay | |
| parent | 13e61b4dc317e6b94962d57f4e1de46d26a5ebb3 (diff) | |
overlay: add CMAKE_C_COMPILER and CMAKE_CXX_COMPILER to overlay-xcompile
CMake prioritizes MinGW over MSVC, which means that the first is used if found in PATH.
Since overlay-xcompile is only meant to be used with MSVC (MinGW provides "-m32" to build as 32 bit), this commit forces the use of "cl".
Diffstat (limited to 'overlay')
| -rw-r--r-- | overlay/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt index e95006ce0..bfb51043f 100644 --- a/overlay/CMakeLists.txt +++ b/overlay/CMakeLists.txt @@ -153,6 +153,9 @@ if(64_BIT AND MSVC) "-DMUMBLE_SOURCE_DIR=${CMAKE_SOURCE_DIR}/src/mumble" "-DMUMBLE_BINARY_DIR=${CMAKE_BINARY_DIR}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" + # Force MSVC, because CMake prioritizes MinGW over it. + "-DCMAKE_C_COMPILER=cl.exe" + "-DCMAKE_CXX_COMPILER=cl.exe" "-DBUILD_OVERLAY_XCOMPILE=ON" "-Dsymbols=${symbols}" ${CMAKE_SOURCE_DIR}/overlay @@ -172,6 +175,9 @@ if(64_BIT AND MSVC) "-DMUMBLE_SOURCE_DIR=${CMAKE_SOURCE_DIR}/src/mumble" "-DMUMBLE_BINARY_DIR=${CMAKE_BINARY_DIR}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" + # Force MSVC, because CMake prioritizes MinGW over it. + "-DCMAKE_C_COMPILER=cl.exe" + "-DCMAKE_CXX_COMPILER=cl.exe" "-DBUILD_OVERLAY_XCOMPILE=ON" "-Dsymbols=${symbols}" ${CMAKE_SOURCE_DIR}/overlay |