[Cmake-commits] CMake branch, next, updated. v3.3.0-2166-g9fc7e85

[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  9fc7e85fcb4522f1ad6e92fc9000fff59d417d27 (commit)
       via  dc64d8250b686c26a557f58dfad46a0a2101299e (commit)
      from  5af5ae973126f7cbdb0f9ebf8140ea8f387b9a24 (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=9fc7e85fcb4522f1ad6e92fc9000fff59d417d27
commit 9fc7e85fcb4522f1ad6e92fc9000fff59d417d27
Merge: 5af5ae9 dc64d82
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 09:37:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 12 09:37:16 2015 -0400

    Merge topic 'fix-hpux-link-search-shared-flags' into next
    
    dc64d825 HP-UX: Fix linker search type flags for C shared libs on HP-UX


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc64d8250b686c26a557f58dfad46a0a2101299e
commit dc64d8250b686c26a557f58dfad46a0a2101299e
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: Wed Aug 12 09:36:57 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:


hooks/post-receive
-- 
CMake