diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-15 17:29:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-15 17:29:11 (GMT) |
| commit | 3658f4425a8ba10761682b5db323ab45650f230b (patch) | |
| tree | ab9fa504219b6a065f3ea2a808329878d4290858 | |
| parent | 080163a6574c6fcdcdb1b194dbd85778ff5a0b66 (diff) | |
| parent | 466ad466b44561c8d48360fed0e491b3c09313be (diff) | |
| download | CMake-3658f4425a8ba10761682b5db323ab45650f230b.zip CMake-3658f4425a8ba10761682b5db323ab45650f230b.tar.gz CMake-3658f4425a8ba10761682b5db323ab45650f230b.tar.bz2 | |
Merge branch 'swift-cross-compile' into release-3.16
Merge-request: !3921
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 515f446..910cc9d 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -56,6 +56,8 @@ static std::string const kCMAKE_POSITION_INDEPENDENT_CODE = static std::string const kCMAKE_SYSROOT = "CMAKE_SYSROOT"; static std::string const kCMAKE_SYSROOT_COMPILE = "CMAKE_SYSROOT_COMPILE"; static std::string const kCMAKE_SYSROOT_LINK = "CMAKE_SYSROOT_LINK"; +static std::string const kCMAKE_Swift_COMPILER_TARGET = + "CMAKE_Swift_COMPILER_TARGET"; static std::string const kCMAKE_TRY_COMPILE_OSX_ARCHITECTURES = "CMAKE_TRY_COMPILE_OSX_ARCHITECTURES"; static std::string const kCMAKE_TRY_COMPILE_PLATFORM_VARIABLES = @@ -671,6 +673,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv, vars.insert(kCMAKE_SYSROOT); vars.insert(kCMAKE_SYSROOT_COMPILE); vars.insert(kCMAKE_SYSROOT_LINK); + vars.insert(kCMAKE_Swift_COMPILER_TARGET); vars.insert(kCMAKE_WARN_DEPRECATED); vars.emplace("CMAKE_MSVC_RUNTIME_LIBRARY"_s); |