summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-08-15 16:55:03 (GMT)
committerBrad King <brad.king@kitware.com>2012-08-15 16:55:03 (GMT)
commit97140d398668c0ab708ac3e0ec72c57605d6f4a9 (patch)
treef03b99921f616363dc1cd9b13cdef232796fad7d
parentf3477ed88c08b8075e047d61f9f19789a7dd214a (diff)
downloadCMake-97140d398668c0ab708ac3e0ec72c57605d6f4a9.zip
CMake-97140d398668c0ab708ac3e0ec72c57605d6f4a9.tar.gz
CMake-97140d398668c0ab708ac3e0ec72c57605d6f4a9.tar.bz2
Tests/Assembler: Do not use assembler in universal binaries
If CMAKE_OSX_ARCHITECTURES is set then the computed assembler .s source file may not work for all architectures. Skip it in that case.
-rw-r--r--Tests/Assembler/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index 3596d05..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|Xcode")
+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)