[Cmake-commits] CMake branch, next, updated. v3.3.0-2164-g5af5ae9

[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  5af5ae973126f7cbdb0f9ebf8140ea8f387b9a24 (commit)
       via  5ad9b19a7167779b5375d575473152a02280b4d8 (commit)
      from  dade9fd21bcf200698ced089ac475447d4f04cea (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=5af5ae973126f7cbdb0f9ebf8140ea8f387b9a24
commit 5af5ae973126f7cbdb0f9ebf8140ea8f387b9a24
Merge: dade9fd 5ad9b19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 09:36:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 12 09:36:45 2015 -0400

    Merge topic 'fix-hpux-link-search-shared-flags' into next
    
    5ad9b19a Revert "HP-UX: Fix shared library search flags on HP-UX."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ad9b19a7167779b5375d575473152a02280b4d8
commit 5ad9b19a7167779b5375d575473152a02280b4d8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 09:35:53 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 12 09:35:53 2015 -0400

    Revert "HP-UX: Fix shared library search flags on HP-UX."
    
    This reverts commit bb20daab87518c42a264f14820a7f32644cfd9ac.
    It turns out that -a,default is correct because its shared-then-static
    behavior is equivalent to -Bdynamic on other platforms.

diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake
index f103975..581301b 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,shared")
+    set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-a,default")
   endforeach()
 endforeach()
 

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

Summary of changes:
 Modules/Platform/HP-UX.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake