aboutsummaryrefslogtreecommitdiff
path: root/scripts/get_cmake_vars
diff options
context:
space:
mode:
authorautoantwort <41973254+autoantwort@users.noreply.github.com>2021-09-10 05:41:01 +0200
committerGitHub <noreply@github.com>2021-09-09 20:41:01 -0700
commitc24f57e9fc85dd4ecfd1b3ab34b72dbf3eb46306 (patch)
tree9769452655ef07d0776909a024b41edc1fce8cf0 /scripts/get_cmake_vars
parentd4aa0d2bfeb8c136570306968699174203896815 (diff)
downloadvcpkg-c24f57e9fc85dd4ecfd1b3ab34b72dbf3eb46306.tar.gz
vcpkg-c24f57e9fc85dd4ecfd1b3ab34b72dbf3eb46306.zip
[meson] fix cross compiling from linux to windows (#18927)
* [meson] fix cross compiling from linux to windows * Fix mingw system name * Omit empty fields from standard libraries * Use VCPKG_CROSSCOMPILING * vcpkg_configure_meson: do not double escape include paths * vcpkg_configure_meson: set winres instead of rc * vcpkg_configure_meson: do not always cross build * Apply suggestions from code review * fix the issue I made * [meson] error when gcc uses a different linker executeable * [meson] apply code review from strega-nil * [meson] more verbose error messages * [meson] remove wrong check Co-authored-by: Kai Pastor <dg0yt@darc.de> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'scripts/get_cmake_vars')
-rw-r--r--scripts/get_cmake_vars/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt
index 1b2e1e561..b6d5f0e41 100644
--- a/scripts/get_cmake_vars/CMakeLists.txt
+++ b/scripts/get_cmake_vars/CMakeLists.txt
@@ -20,7 +20,7 @@ foreach(prog IN LISTS PROGLIST)
endforeach()
set(COMPILERS ${VCPKG_LANGUAGES} RC)
foreach(prog IN LISTS COMPILERS)
- list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER)
+ list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER CMAKE_${prog}_COMPILER_ID)
endforeach()
# Variables to check
foreach(_lang IN LISTS VCPKG_LANGUAGES)