[Cmake-commits] CMake branch, next, updated. v2.8.4-1074-g032b2d8

[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  032b2d8e983b834bbfcb46173c40ed2922603a2d (commit)
       via  d0f71e2545e234671abe3b6de325726f23cf854d (commit)
       via  bd580be526f7b394fb84960f3f706dae2d0eb940 (commit)
      from  04bdc55b0f632a7c7fa19be6505ff5f9be9c5a1d (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=032b2d8e983b834bbfcb46173c40ed2922603a2d
commit 032b2d8e983b834bbfcb46173c40ed2922603a2d
Merge: 04bdc55 d0f71e2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 2 17:50:09 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 2 17:50:09 2011 -0500

    Merge topic 'ReworkedAsmSupport' into next
    
    d0f71e2 Add ASM platform information for HP compiler on HP
    bd580be Merge branch 'hp-compiler-info' into ReworkedAsmSupport


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

    Add ASM platform information for HP compiler on HP
    
    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/HP-UX-HP-ASM.cmake b/Modules/Platform/HP-UX-HP-ASM.cmake
new file mode 100644
index 0000000..0a85905
--- /dev/null
+++ b/Modules/Platform/HP-UX-HP-ASM.cmake
@@ -0,0 +1,6 @@
+include(Platform/HP-UX-HP)
+__hpux_compiler_hp(ASM)
+
+set(CMAKE_SHARED_LIBRARY_CREATE_ASM_FLAGS "-E -b +nodefaultrpath -L/usr/lib")
+
+set(CMAKE_ASM_CREATE_SHARED_LIBRARY "ld <CMAKE_SHARED_LIBRARY_CREATE_ASM_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG><TARGET_SONAME> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
diff --git a/Modules/Platform/HP-UX-HP.cmake b/Modules/Platform/HP-UX-HP.cmake
index 772edb4..5e70d31 100644
--- a/Modules/Platform/HP-UX-HP.cmake
+++ b/Modules/Platform/HP-UX-HP.cmake
@@ -20,6 +20,7 @@ set(__HPUX_COMPILER_HP 1)
 set(_Wl_C "")
 set(_Wl_CXX "-Wl,")
 set(_Wl_Fortran "")
+set(_Wl_ASM "")
 
 macro(__hpux_compiler_hp lang)
   set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "+Z")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd580be526f7b394fb84960f3f706dae2d0eb940
commit bd580be526f7b394fb84960f3f706dae2d0eb940
Merge: a0bab7a 5f0a259
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 2 17:40:55 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 2 17:40:55 2011 -0500

    Merge branch 'hp-compiler-info' into ReworkedAsmSupport


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

Summary of changes:
 Modules/Platform/HP-UX-HP-ASM.cmake |    6 ++++++
 Modules/Platform/HP-UX-HP.cmake     |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 Modules/Platform/HP-UX-HP-ASM.cmake


hooks/post-receive
-- 
CMake