[Cmake-commits] CMake branch, next, updated. v2.8.12-4742-gc4c3df9

[Brad King]

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  c4c3df9ee7f18e720ca7c3c8f2db43c261c1ca7c (commit)
       via  f60797f75b882acfb89e4dd3698fb085ba182753 (commit)
      from  dcd250692708ce8a42dfe12fd05e222a96aa3a45 (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=c4c3df9ee7f18e720ca7c3c8f2db43c261c1ca7c
commit c4c3df9ee7f18e720ca7c3c8f2db43c261c1ca7c
Merge: dcd2506 f60797f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 1 11:00:22 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 1 11:00:22 2013 -0400

    Merge topic 'test-Assembler-no-g' into next
    
    f60797f Tests/Assembler: Drop -g when generating sample assembly source


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f60797f75b882acfb89e4dd3698fb085ba182753
commit f60797f75b882acfb89e4dd3698fb085ba182753
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 1 10:55:58 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 1 10:55:58 2013 -0400

    Tests/Assembler: Drop -g when generating sample assembly source
    
    Some compilers, such as Clang on OS X, do not want the -g flag for both
    generating assembly code and assembling it.  Drop the -g flag from
    generation of main.s in the Assembler test.

diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index 1f07dc9..fdc5c00 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -15,6 +15,9 @@ if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode" AND
     if(CMAKE_OSX_SYSROOT AND CMAKE_C_SYSROOT_FLAG AND NOT ";${C_FLAGS};" MATCHES ";${CMAKE_C_SYSROOT_FLAG};")
       list(APPEND C_FLAGS ${CMAKE_C_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT})
     endif()
+    # Clang on OS X, and perhaps other compilers, do not support -g
+    # for both generating and assembling, so drop it from generating.
+    list(REMOVE_ITEM C_FLAGS -g)
     set(SRCS main.s)
     add_custom_command(
       OUTPUT main.s

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

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


hooks/post-receive
-- 
CMake