diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-19 14:53:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-19 14:54:28 (GMT) |
| commit | e893c53b8c09984bc11bfc2b7a831930eec9fb91 (patch) | |
| tree | 80bb6df9ec3dff710aaa69f8de35c4f4fbab08a2 /Modules/CMakeCCompiler.cmake.in | |
| parent | 65f73c0ae178d98fec5ae0c103faebca2b02ba3b (diff) | |
| parent | bc5bcad45e1eaebbea0f1409f096d166cdb778d9 (diff) | |
| download | CMake-e893c53b8c09984bc11bfc2b7a831930eec9fb91.zip CMake-e893c53b8c09984bc11bfc2b7a831930eec9fb91.tar.gz CMake-e893c53b8c09984bc11bfc2b7a831930eec9fb91.tar.bz2 | |
Merge topic 'xcode-10-archs'
bc5bcad45e Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2153
Diffstat (limited to 'Modules/CMakeCCompiler.cmake.in')
| -rw-r--r-- | Modules/CMakeCCompiler.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in index 8ad0c01..72144cf 100644 --- a/Modules/CMakeCCompiler.cmake.in +++ b/Modules/CMakeCCompiler.cmake.in @@ -15,7 +15,7 @@ set(CMAKE_C_SIMULATE_ID "@CMAKE_C_SIMULATE_ID@") set(CMAKE_C_SIMULATE_VERSION "@CMAKE_C_SIMULATE_VERSION@") @_SET_CMAKE_C_COMPILER_ARCHITECTURE_ID@ @SET_MSVC_C_ARCHITECTURE_ID@ -@SET_CMAKE_XCODE_CURRENT_ARCH@ +@SET_CMAKE_XCODE_ARCHS@ set(CMAKE_AR "@CMAKE_AR@") set(CMAKE_C_COMPILER_AR "@CMAKE_C_COMPILER_AR@") set(CMAKE_RANLIB "@CMAKE_RANLIB@") |