diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 19:39:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 19:39:09 (GMT) |
| commit | b7f3cc22c3e4c3ff40efcc0f0a516148b9bc43fa (patch) | |
| tree | ce60059575c724db2fd9ed4639ac3f9353ee6005 /Tests | |
| parent | 2582994e57004d02f5609f9d5c2c57071140fdf8 (diff) | |
| parent | 97140d398668c0ab708ac3e0ec72c57605d6f4a9 (diff) | |
| download | CMake-b7f3cc22c3e4c3ff40efcc0f0a516148b9bc43fa.zip CMake-b7f3cc22c3e4c3ff40efcc0f0a516148b9bc43fa.tar.gz CMake-b7f3cc22c3e4c3ff40efcc0f0a516148b9bc43fa.tar.bz2 | |
Merge topic 'xcode-asm'
97140d3 Tests/Assembler: Do not use assembler in universal binaries
f3477ed Xcode: Set ASM source language in project file (#13472)
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Assembler/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt index 415fcce..94a6325 100644 --- a/Tests/Assembler/CMakeLists.txt +++ b/Tests/Assembler/CMakeLists.txt @@ -7,7 +7,8 @@ set(SRCS) # (at least) the following toolchains can process assembler files directly # and also generate assembler files from C: -if("${CMAKE_GENERATOR}" MATCHES "Makefile") +if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode" AND + NOT CMAKE_OSX_ARCHITECTURES) if(("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|Clang|HP|SunPro|XL)$") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel" AND UNIX)) set(C_FLAGS "${CMAKE_C_FLAGS}") separate_arguments(C_FLAGS) |