[Cmake-commits] CMake branch, next, updated. v2.8.4-1069-g1dbc97f

[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  1dbc97fc23766685424ecd52b0936007fe9a9030 (commit)
       via  a0bab7ae694b65c68c1ab463fafbe036af73949f (commit)
       via  c03b610c0aa20b298b15af401e1312c2b73beceb (commit)
       via  c623008376a0758b1cb1b8f404d6a148ce938b8e (commit)
      from  017d95dfc3c730e83504c52c6b9a5df25054d7bf (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=1dbc97fc23766685424ecd52b0936007fe9a9030
commit 1dbc97fc23766685424ecd52b0936007fe9a9030
Merge: 017d95d a0bab7a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 2 13:51:55 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 2 13:51:55 2011 -0500

    Merge topic 'ReworkedAsmSupport' into next
    
    a0bab7a Add ASM platform information for XL compiler on AIX
    c03b610 Merge branch 'aix-xl-platform-info' into ReworkedAsmSupport
    c623008 Initialize ASM rpath flags for executables with those for shared libs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0bab7ae694b65c68c1ab463fafbe036af73949f
commit a0bab7ae694b65c68c1ab463fafbe036af73949f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 2 13:47:26 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 2 13:48:04 2011 -0500

    Add ASM platform information for XL compiler on AIX
    
    Among other flags this sets RPATH flags correctly so that CMake knows
    how to treat CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH for the ASM language.

diff --git a/Modules/Platform/AIX-XL-ASM.cmake b/Modules/Platform/AIX-XL-ASM.cmake
new file mode 100644
index 0000000..ea0944b
--- /dev/null
+++ b/Modules/Platform/AIX-XL-ASM.cmake
@@ -0,0 +1,2 @@
+include(Platform/AIX-XL)
+__aix_compiler_xl(ASM)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c03b610c0aa20b298b15af401e1312c2b73beceb
commit c03b610c0aa20b298b15af401e1312c2b73beceb
Merge: c623008 d30dcf1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 2 13:47:11 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 2 13:47:11 2011 -0500

    Merge branch 'aix-xl-platform-info' into ReworkedAsmSupport


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c623008376a0758b1cb1b8f404d6a148ce938b8e
commit c623008376a0758b1cb1b8f404d6a148ce938b8e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 2 13:44:13 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 2 13:44:13 2011 -0500

    Initialize ASM rpath flags for executables with those for shared libs
    
    Since the flags for executables are almost always the same as those for
    shared libraries each language information file just uses the latter for
    the former by default.  This reduces duplication in the compiler and
    platform flag information files.

diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake
index fb1b976..d50f351 100644
--- a/Modules/CMakeASMInformation.cmake
+++ b/Modules/CMakeASMInformation.cmake
@@ -104,6 +104,18 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE)
     "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> <CMAKE_ASM${ASM_DIALECT}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>")
 ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE)
 
+IF(NOT CMAKE_EXECUTABLE_RUNTIME_ASM${ASM_DIALECT}_FLAG)
+  SET(CMAKE_EXECUTABLE_RUNTIME_ASM${ASM_DIALECT}_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_ASM${ASM_DIALECT}_FLAG})
+ENDIF()
+
+IF(NOT CMAKE_EXECUTABLE_RUNTIME_ASM${ASM_DIALECT}_FLAG_SEP)
+  SET(CMAKE_EXECUTABLE_RUNTIME_ASM${ASM_DIALECT}_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_ASM${ASM_DIALECT}_FLAG_SEP})
+ENDIF()
+
+IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_ASM${ASM_DIALECT}_FLAG)
+  SET(CMAKE_EXECUTABLE_RPATH_LINK_ASM${ASM_DIALECT}_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_ASM${ASM_DIALECT}_FLAG})
+ENDIF()
+
 # to be done
 IF(NOT CMAKE_ASM${ASM_DIALECT}_CREATE_SHARED_LIBRARY)
   SET(CMAKE_ASM${ASM_DIALECT}_CREATE_SHARED_LIBRARY)

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

Summary of changes:
 Modules/CMakeASMInformation.cmake                  |   12 ++++++++++++
 .../Platform/{AIX-XL-C.cmake => AIX-XL-ASM.cmake}  |    2 +-
 2 files changed, 13 insertions(+), 1 deletions(-)
 copy Modules/Platform/{AIX-XL-C.cmake => AIX-XL-ASM.cmake} (52%)


hooks/post-receive
-- 
CMake