[Cmake-commits] CMake branch, next, updated. v3.3.1-2274-g6a9aa5b

[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  6a9aa5b378422f8d0d89b53e181c4bec2104f082 (commit)
       via  625225bbe6a84350759d7116a6cd5ad2f850e635 (commit)
      from  4527e186cb891f4dfe7c025066566a4f7d1a4346 (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=6a9aa5b378422f8d0d89b53e181c4bec2104f082
commit 6a9aa5b378422f8d0d89b53e181c4bec2104f082
Merge: 4527e18 625225b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 20 09:25:12 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 20 09:25:12 2015 -0400

    Merge topic 'hp-ux-itanium-shared-libs' into next
    
    625225bb HP-UX: Do not use ".sl" extension for shared libs on Itanium


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=625225bbe6a84350759d7116a6cd5ad2f850e635
commit 625225bbe6a84350759d7116a6cd5ad2f850e635
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 18 10:55:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 18 10:55:16 2015 -0400

    HP-UX: Do not use ".sl" extension for shared libs on Itanium
    
    Instead use the standard ".so" extension.
    
    Suggested-by: Gerhard Grimm <gerhard.grimm at detec.com>

diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake
index 65cc731..df042cd 100644
--- a/Modules/Platform/HP-UX.cmake
+++ b/Modules/Platform/HP-UX.cmake
@@ -1,9 +1,11 @@
 set(CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH /usr/lib)
 
-set(CMAKE_SHARED_LIBRARY_SUFFIX ".sl")          # .so
+if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "ia64")
+  set(CMAKE_SHARED_LIBRARY_SUFFIX ".sl")          # .so
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ".sl" ".so" ".a")
+  set(CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES ".so")
+endif()
 set(CMAKE_DL_LIBS "dld")
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".sl" ".so" ".a")
-set(CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES ".so")
 
 # The HP linker needs to find transitive shared library dependencies
 # in the -L path.  Therefore the runtime path must be added to the

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

Summary of changes:
 Modules/Platform/HP-UX.cmake |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake