This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 05693aa835ecb3610e3e1a28ecc7b8f445ac2828 (commit)
via f3477ed88c08b8075e047d61f9f19789a7dd214a (commit)
from 22590d2d624ae0f3d41c3384377e0318d12073ff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05693aa835ecb3610e3e1a28ecc7b8f445ac2828
commit 05693aa835ecb3610e3e1a28ecc7b8f445ac2828
Merge: 22590d2 f3477ed
Author: Brad King <[email protected]>
AuthorDate: Wed Aug 15 11:36:22 2012 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Aug 15 11:36:22 2012 -0400
Merge topic 'xcode-asm' into next
f3477ed Xcode: Set ASM source language in project file (#13472)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3477ed88c08b8075e047d61f9f19789a7dd214a
commit f3477ed88c08b8075e047d61f9f19789a7dd214a
Author: Brad King <[email protected]>
AuthorDate: Wed Aug 15 09:50:51 2012 -0400
Commit: Brad King <[email protected]>
CommitDate: Wed Aug 15 11:03:57 2012 -0400
Xcode: Set ASM source language in project file (#13472)
Also teach the Assembler test to build under Xcode.
Suggested-by: Tobias Pape <[email protected]>
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index ae92a0a..e8ab38f 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 415fcce..3596d05 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)
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 4 ++++
Tests/Assembler/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
