From f3477ed88c08b8075e047d61f9f19789a7dd214a Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 15 Aug 2012 09:50:51 -0400 Subject: [PATCH 1/2] Xcode: Set ASM source language in project file (#13472) Also teach the Assembler test to build under Xcode. Suggested-by: Tobias Pape --- Source/cmGlobalXCodeGenerator.cxx | 4 ++++ Tests/Assembler/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index ae92a0af8..e8ab38fe1 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -787,6 +787,10 @@ GetSourcecodeValueFromFileExtension(const std::string& _ext, { sourcecode += ".fortran.f90"; } + else if(lang == "ASM") + { + sourcecode += ".asm"; + } //else // { // // Already specialized above or we leave sourcecode == "sourcecode" diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt index 415fcce40..3596d0506 100644 --- a/Tests/Assembler/CMakeLists.txt +++ b/Tests/Assembler/CMakeLists.txt @@ -7,7 +7,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") +if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode") 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) From 97140d398668c0ab708ac3e0ec72c57605d6f4a9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 15 Aug 2012 12:55:03 -0400 Subject: [PATCH 2/2] 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. --- Tests/Assembler/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt index 3596d0506..94a6325c8 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)