diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-18 17:39:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-18 17:44:43 (GMT) |
| commit | bc5bcad45e1eaebbea0f1409f096d166cdb778d9 (patch) | |
| tree | 288910094177ffd862809b3d596dbaa7521aa64d /Modules/CMakeDetermineCCompiler.cmake | |
| parent | ef5e2e8a62982ebccf4883fc7a01cdb66f8ca183 (diff) | |
| download | CMake-bc5bcad45e1eaebbea0f1409f096d166cdb778d9.zip CMake-bc5bcad45e1eaebbea0f1409f096d166cdb778d9.tar.gz CMake-bc5bcad45e1eaebbea0f1409f096d166cdb778d9.tar.bz2 | |
Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH
Xcode 10 no longer populates `CURRENT_ARCH` with the current
architecture in shell scripts and instead uses `undefined_arch`.
Instead we must use `ARCHS`. It lists all architectures separated by
spaces.
Fixes: #18085
Diffstat (limited to 'Modules/CMakeDetermineCCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCCompiler.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index 7e6ca1e..17706ea 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -183,9 +183,9 @@ if(MSVC_C_ARCHITECTURE_ID) "set(MSVC_C_ARCHITECTURE_ID ${MSVC_C_ARCHITECTURE_ID})") endif() -if(CMAKE_C_XCODE_CURRENT_ARCH) - set(SET_CMAKE_XCODE_CURRENT_ARCH - "set(CMAKE_XCODE_CURRENT_ARCH ${CMAKE_C_XCODE_CURRENT_ARCH})") +if(CMAKE_C_XCODE_ARCHS) + set(SET_CMAKE_XCODE_ARCHS + "set(CMAKE_XCODE_ARCHS \"${CMAKE_C_XCODE_ARCHS}\")") endif() # configure variables set in this file for fast reload later on |