diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2019-07-26 12:45:56 (GMT) |
|---|---|---|
| committer | Cristian Adam <cristian.adam@gmail.com> | 2019-12-13 15:35:38 (GMT) |
| commit | a9b41195d292cfd0686b6c1f4d22f654728dca0b (patch) | |
| tree | 4e9d37ef3f1738b54525538d083902b9d1821b71 /Source/cmCoreTryCompile.cxx | |
| parent | 372c89ea38dd56457f93c688f1e8bf30a25bad57 (diff) | |
| download | CMake-a9b41195d292cfd0686b6c1f4d22f654728dca0b.zip CMake-a9b41195d292cfd0686b6c1f4d22f654728dca0b.tar.gz CMake-a9b41195d292cfd0686b6c1f4d22f654728dca0b.tar.bz2 | |
Handle multi-arch sysroots on Apple platforms
Diffstat (limited to 'Source/cmCoreTryCompile.cxx')
| -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 5711cae..4715cfa 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -51,6 +51,8 @@ static std::string const kCMAKE_OSX_ARCHITECTURES = "CMAKE_OSX_ARCHITECTURES"; static std::string const kCMAKE_OSX_DEPLOYMENT_TARGET = "CMAKE_OSX_DEPLOYMENT_TARGET"; static std::string const kCMAKE_OSX_SYSROOT = "CMAKE_OSX_SYSROOT"; +static std::string const kCMAKE_APPLE_ARCH_SYSROOTS = + "CMAKE_APPLE_ARCH_SYSROOTS"; static std::string const kCMAKE_POSITION_INDEPENDENT_CODE = "CMAKE_POSITION_INDEPENDENT_CODE"; static std::string const kCMAKE_SYSROOT = "CMAKE_SYSROOT"; @@ -723,6 +725,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv, vars.insert(kCMAKE_OSX_ARCHITECTURES); vars.insert(kCMAKE_OSX_DEPLOYMENT_TARGET); vars.insert(kCMAKE_OSX_SYSROOT); + vars.insert(kCMAKE_APPLE_ARCH_SYSROOTS); vars.insert(kCMAKE_POSITION_INDEPENDENT_CODE); vars.insert(kCMAKE_SYSROOT); vars.insert(kCMAKE_SYSROOT_COMPILE); |