[Cmake-commits] CMake branch, next, updated. v2.8.4-1091-g39f9db5

Brad King brad.king at kitware.com
Fri Mar 4 09:15:32 EST 2011


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  39f9db53a14d34e68c82ef919e239aba9ffa6f66 (commit)
       via  80f6a344fc7cba25419e27b078a52d1c41280b02 (commit)
       via  1dafa7498f0dced8522b8244dd8dbf8176f0fe5b (commit)
      from  5bdb41118dc7b529c1180d5253081958b2ff5429 (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=39f9db53a14d34e68c82ef919e239aba9ffa6f66
commit 39f9db53a14d34e68c82ef919e239aba9ffa6f66
Merge: 5bdb411 80f6a34
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 4 09:15:29 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 4 09:15:29 2011 -0500

    Merge topic 'ReworkedAsmSupport' into next
    
    80f6a34 Teach Assembler test to generate main.s at build time
    1dafa74 Fix Assembler test to parse C flags string before using


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80f6a344fc7cba25419e27b078a52d1c41280b02
commit 80f6a344fc7cba25419e27b078a52d1c41280b02
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 4 09:08:18 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 4 09:08:18 2011 -0500

    Teach Assembler test to generate main.s at build time
    
    Use a custom command to generate the assembly source file at build time.
    Also set CMAKE_VERBOSE_MAKEFILE so the test output contains all the
    build rules.  These two changes will show the entire .c -> .s -> .o and
    final link commands in the test output.

diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index ce42afb..6071181 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project(Assembler)
+message("CTEST_FULL_OUTPUT ")
+set(CMAKE_VERBOSE_MAKEFILE 1)
 
 set(SRCS)
 
@@ -9,8 +11,13 @@ if("${CMAKE_GENERATOR}" MATCHES "Makefile")
   if(("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|SunPro|XL)$") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel"  AND  UNIX))
     set(C_FLAGS "${CMAKE_C_FLAGS}")
     separate_arguments(C_FLAGS)
-    execute_process(COMMAND ${CMAKE_C_COMPILER} ${C_FLAGS} -S "${CMAKE_CURRENT_SOURCE_DIR}/main.c" -o "${CMAKE_CURRENT_BINARY_DIR}/main.s")
-    set(SRCS "${CMAKE_CURRENT_BINARY_DIR}/main.s")
+    set(SRCS main.s)
+    add_custom_command(
+      OUTPUT main.s
+      COMMAND ${CMAKE_C_COMPILER} ${C_FLAGS} -S ${CMAKE_CURRENT_SOURCE_DIR}/main.c -o main.s
+      DEPENDS main.c
+      VERBATIM
+      )
   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=1dafa7498f0dced8522b8244dd8dbf8176f0fe5b
commit 1dafa7498f0dced8522b8244dd8dbf8176f0fe5b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 4 08:59:56 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 4 08:59:56 2011 -0500

    Fix Assembler test to parse C flags string before using
    
    Commit 1f6c6b1c (use CMAKE_C_FLAGS when generating the assembler file,
    2011-03-03) added use of CMAKE_C_FLAGS to the assembler generation step.
    However, this variable is meant for direct substitution into a shell
    command line so we need to parse it to separate the arguments first.

diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index 4036cbd..ce42afb 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -7,7 +7,9 @@ set(SRCS)
 # and also generate assembler files from C:
 if("${CMAKE_GENERATOR}" MATCHES "Makefile")
   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(C_FLAGS "${CMAKE_C_FLAGS}")
+    separate_arguments(C_FLAGS)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} ${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|SunPro|XL)$") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel"  AND  UNIX))
 endif("${CMAKE_GENERATOR}" MATCHES "Makefile")

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list