diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-29 09:05:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-09-29 09:05:49 (GMT) |
| commit | 8f75912176e74bc39dc18f6f1ae7fe65cca27017 (patch) | |
| tree | fdbe9a354f7a3cad2e821cbef5d97bb85d79c5a1 /Tests/Assembler | |
| parent | dd0743fdf80016096077e7689fe8698ab1159098 (diff) | |
| download | CMake-8f75912176e74bc39dc18f6f1ae7fe65cca27017.zip CMake-8f75912176e74bc39dc18f6f1ae7fe65cca27017.tar.gz CMake-8f75912176e74bc39dc18f6f1ae7fe65cca27017.tar.bz2 | |
Tests: Enable Assembler test case when CMAKE_OSX_ARCHITECTURES has one value
Diffstat (limited to 'Tests/Assembler')
| -rw-r--r-- | Tests/Assembler/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt index a3c9946..cee5210 100644 --- a/Tests/Assembler/CMakeLists.txt +++ b/Tests/Assembler/CMakeLists.txt @@ -8,7 +8,7 @@ set(SRCS) # (at least) the following toolchains can process assembler files directly # and also generate assembler files from C: if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode|Ninja" AND - NOT CMAKE_OSX_ARCHITECTURES) + NOT CMAKE_OSX_ARCHITECTURES MATCHES ";") if((CMAKE_C_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang|HP|SunPro|XL)$") OR (CMAKE_C_COMPILER_ID STREQUAL "Intel" AND UNIX) AND NOT (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND "x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")) set(C_FLAGS "${CMAKE_C_FLAGS}") @@ -16,6 +16,9 @@ if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode|Ninja" AND if(CMAKE_OSX_SYSROOT AND CMAKE_C_SYSROOT_FLAG AND NOT ";${C_FLAGS};" MATCHES ";${CMAKE_C_SYSROOT_FLAG};") list(APPEND C_FLAGS ${CMAKE_C_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT}) endif() + if(CMAKE_OSX_ARCHITECTURES) + list(APPEND C_FLAGS -arch ${CMAKE_OSX_ARCHITECTURES}) + endif() # Clang on OS X, and perhaps other compilers, do not support -g # for both generating and assembling, so drop it from generating. list(REMOVE_ITEM C_FLAGS -g) |