[Cmake-commits] CMake branch, next, updated. v2.8.4-1062-g718ee01

[Alexander Neundorf]

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  718ee012bc5f1a2d60ee576c90dbb9f770885451 (commit)
       via  17c658f819cee5af4854239f8d4aa6b0f51970ce (commit)
      from  bfae221b7c968c553209b357922f0e6fa624b694 (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=718ee012bc5f1a2d60ee576c90dbb9f770885451
commit 718ee012bc5f1a2d60ee576c90dbb9f770885451
Merge: bfae221 17c658f
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Mar 2 10:50:38 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 2 10:50:38 2011 -0500

    Merge topic 'ReworkedAsmSupport' into next
    
    17c658f Add support for the Intel compiler used for ASM under Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17c658f819cee5af4854239f8d4aa6b0f51970ce
commit 17c658f819cee5af4854239f8d4aa6b0f51970ce
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Mar 2 16:46:25 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Mar 2 16:46:25 2011 +0100

    Add support for the Intel compiler used for ASM under Windows
    
    Alex

diff --git a/Modules/Compiler/Intel-ASM.cmake b/Modules/Compiler/Intel-ASM.cmake
index aa0d8df..59b50a1 100644
--- a/Modules/Compiler/Intel-ASM.cmake
+++ b/Modules/Compiler/Intel-ASM.cmake
@@ -6,4 +6,8 @@ SET(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
 SET(CMAKE_ASM_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
 SET(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
 
-set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s)
+IF(UNIX)
+  SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;S)
+ELSE(UNIX)
+  SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm)
+ENDIF(UNIX)
diff --git a/Modules/Platform/Windows-Intel-ASM.cmake b/Modules/Platform/Windows-Intel-ASM.cmake
new file mode 100644
index 0000000..31d08c7
--- /dev/null
+++ b/Modules/Platform/Windows-Intel-ASM.cmake
@@ -0,0 +1,2 @@
+include(Platform/Windows-Intel)
+__windows_compiler_intel(ASM)

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/Intel-ASM.cmake                   |    6 +++++-
 ...ndows-Intel-C.cmake => Windows-Intel-ASM.cmake} |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
 copy Modules/Platform/{Windows-Intel-C.cmake => Windows-Intel-ASM.cmake} (51%)


hooks/post-receive
-- 
CMake