[Cmake-commits] CMake branch, next, updated. v3.3.0-2132-g69e527a

[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  69e527a1c2f170afb6dbb5179fe2f97d609496ea (commit)
       via  bb20daab87518c42a264f14820a7f32644cfd9ac (commit)
       via  6b64e252425e54995786e3547ae6348462211461 (commit)
      from  4ccb6de8681083cb15099fd69a9f01ed4515a2a3 (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=69e527a1c2f170afb6dbb5179fe2f97d609496ea
commit 69e527a1c2f170afb6dbb5179fe2f97d609496ea
Merge: 4ccb6de bb20daa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 11 08:56:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 11 08:56:33 2015 -0400

    Merge topic 'fix-hpux-link-search-shared-flags' into next
    
    bb20daab HP-UX: Fix shared library search flags on HP-UX.
    6b64e252 HP-UX: Fix linker search type flags for C shared libs on HP-UX


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb20daab87518c42a264f14820a7f32644cfd9ac
commit bb20daab87518c42a264f14820a7f32644cfd9ac
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Aug 10 13:27:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 11 08:51:07 2015 -0400

    HP-UX: Fix shared library search flags on HP-UX.
    
    In the HP-UX platform file, -Wl,-a-default is used for shared library
    searches.  According to the reference manual for the HP compilers, the
    default option will search for shared libraries and fallback to static
    if not available.  This restricts the search to use shared libs
    exclusively with the -Wl,-a,shared flag to put behavior in sync with all
    other platforms.
    
    See "HP Itanium-based Systems HP aC++/HP C Programmer's Guide"
    Chapter "Tools and Libraries", Section "Creating and Using Libraries"

diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake
index 581301b..f103975 100644
--- a/Modules/Platform/HP-UX.cmake
+++ b/Modules/Platform/HP-UX.cmake
@@ -37,7 +37,7 @@ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   foreach(lang C CXX)
     set(CMAKE_${type}_LINK_STATIC_${lang}_FLAGS "-Wl,-a,archive")
-    set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-a,default")
+    set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-a,shared")
   endforeach()
 endforeach()
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b64e252425e54995786e3547ae6348462211461
commit 6b64e252425e54995786e3547ae6348462211461
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Aug 10 13:21:40 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 11 08:50:24 2015 -0400

    HP-UX: Fix linker search type flags for C shared libs on HP-UX
    
    Since commit v2.8.7~31^2 (HP: Drive shared library linking with compiler
    front end, 2011-12-12) the C compiler is used to link shared libraries
    instead of calling the linker directly, so linker options need to be
    wrapped as -Wl,-foo instead of -foo.

diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake
index 65cc731..581301b 100644
--- a/Modules/Platform/HP-UX.cmake
+++ b/Modules/Platform/HP-UX.cmake
@@ -33,18 +33,11 @@ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 # Initialize C and CXX link type selection flags.  These flags are
 # used when building a shared library, shared module, or executable
 # that links to other libraries to select whether to use the static or
-# shared versions of the libraries.  Note that C modules and shared
-# libs are built using ld directly so we leave off the "-Wl," portion.
-foreach(type SHARED_LIBRARY SHARED_MODULE)
-  set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-a archive")
-  set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-a default")
-endforeach()
-foreach(type EXE)
-  set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-a,archive")
-  set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-a,default")
-endforeach()
+# shared versions of the libraries.
 foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
-  set(CMAKE_${type}_LINK_STATIC_CXX_FLAGS "-Wl,-a,archive")
-  set(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Wl,-a,default")
+  foreach(lang C CXX)
+    set(CMAKE_${type}_LINK_STATIC_${lang}_FLAGS "-Wl,-a,archive")
+    set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-a,default")
+  endforeach()
 endforeach()
 

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

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


hooks/post-receive
-- 
CMake