[Cmake-commits] CMake branch, next, updated. v2.8.4-1083-g2bdac99

[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  2bdac994e5f4e9ce8e1810ea80f7fd8a693e6443 (commit)
       via  4139a734fae11d2ece631ff4805556ee2a6de66b (commit)
       via  1f6c6b1cc27fe867fa942210a657d691b8fb575c (commit)
      from  24e676e43f7d322985b2d270b1b068a91879f256 (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=2bdac994e5f4e9ce8e1810ea80f7fd8a693e6443
commit 2bdac994e5f4e9ce8e1810ea80f7fd8a693e6443
Merge: 24e676e 4139a73
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Mar 3 17:05:29 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 3 17:05:29 2011 -0500

    Merge topic 'ReworkedAsmSupport' into next
    
    4139a73 -only enable the asm test for the Intel compiler if we are under UNIX
    1f6c6b1 -use CMAKE_C_FLAGS when generating the assembler file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4139a734fae11d2ece631ff4805556ee2a6de66b
commit 4139a734fae11d2ece631ff4805556ee2a6de66b
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Mar 3 23:02:12 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Mar 3 23:02:12 2011 +0100

    -only enable the asm test for the Intel compiler if we are under UNIX
    
    ...have to find out how to generate assembler with icl.exe
    
    Alex

diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index 30485c9..4036cbd 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -6,10 +6,10 @@ 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_C_COMPILER_ID}" MATCHES "^(GNU|HP|Intel|SunPro|XL)$")
+  if(("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|SunPro|XL)$") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel"  AND  UNIX))
     execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_FLAGS} -S "${CMAKE_CURRENT_SOURCE_DIR}/main.c" -o "${CMAKE_CURRENT_BINARY_DIR}/main.s")
     set(SRCS "${CMAKE_CURRENT_BINARY_DIR}/main.s")
-  endif("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|Intel|SunPro|XL)$")
+  endif(("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|SunPro|XL)$") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel"  AND  UNIX))
 endif("${CMAKE_GENERATOR}" MATCHES "Makefile")
 
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f6c6b1cc27fe867fa942210a657d691b8fb575c
commit 1f6c6b1cc27fe867fa942210a657d691b8fb575c
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Mar 3 22:56:57 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Mar 3 22:56:57 2011 +0100

    -use CMAKE_C_FLAGS when generating the assembler file
    
    Alex

diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index 32727ed..30485c9 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SRCS)
 # and also generate assembler files from C:
 if("${CMAKE_GENERATOR}" MATCHES "Makefile")
   if("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|Intel|SunPro|XL)$")
-    execute_process(COMMAND ${CMAKE_C_COMPILER} -S "${CMAKE_CURRENT_SOURCE_DIR}/main.c" -o "${CMAKE_CURRENT_BINARY_DIR}/main.s")
+    execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_FLAGS} -S "${CMAKE_CURRENT_SOURCE_DIR}/main.c" -o "${CMAKE_CURRENT_BINARY_DIR}/main.s")
     set(SRCS "${CMAKE_CURRENT_BINARY_DIR}/main.s")
   endif("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|Intel|SunPro|XL)$")
 endif("${CMAKE_GENERATOR}" MATCHES "Makefile")

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

Summary of changes:
 Tests/Assembler/CMakeLists.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake