diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-18 13:39:23 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-18 13:44:43 -0400 |
| commit | bc5bcad45e1eaebbea0f1409f096d166cdb778d9 (patch) | |
| tree | 288910094177ffd862809b3d596dbaa7521aa64d /Modules/CMakeDetermineCXXCompiler.cmake | |
| parent | ef5e2e8a62982ebccf4883fc7a01cdb66f8ca183 (diff) | |
| download | cmake-bc5bcad45e1eaebbea0f1409f096d166cdb778d9.tar.gz | |
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/CMakeDetermineCXXCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index c0fb3b6bda..70d17a1810 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -181,9 +181,9 @@ if(MSVC_CXX_ARCHITECTURE_ID) "set(MSVC_CXX_ARCHITECTURE_ID ${MSVC_CXX_ARCHITECTURE_ID})") endif() -if(CMAKE_CXX_XCODE_CURRENT_ARCH) - set(SET_CMAKE_XCODE_CURRENT_ARCH - "set(CMAKE_XCODE_CURRENT_ARCH ${CMAKE_CXX_XCODE_CURRENT_ARCH})") +if(CMAKE_CXX_XCODE_ARCHS) + set(SET_CMAKE_XCODE_ARCHS + "set(CMAKE_XCODE_ARCHS \"${CMAKE_CXX_XCODE_ARCHS}\")") endif() # configure all variables set in this file |