[cmake-commits] king committed FreeBSD.cmake 1.10 1.11 HP-UX.cmake 1.25 1.26 IRIX.cmake 1.13 1.14 IRIX64.cmake 1.18 1.19 SunOS.cmake 1.21 1.22

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Feb 1 09:57:43 EST 2008


Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv28845/Modules/Platform

Modified Files:
	FreeBSD.cmake HP-UX.cmake IRIX.cmake IRIX64.cmake SunOS.cmake 
Log Message:
ENH: Enable dependent library search paths on more platforms

  - HP-UX needs dependent library paths as -L options.
  - IRIX needs dependent library paths as -L options.
  - Sun needs dependent library paths as -L options.
  - FreeBSD needs dependent library paths in -rpath-link option.


Index: SunOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/SunOS.cmake,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- SunOS.cmake	15 Jan 2008 19:19:32 -0000	1.21
+++ SunOS.cmake	1 Feb 2008 14:57:41 -0000	1.22
@@ -98,3 +98,9 @@
     SET(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Bdynamic")
   ENDFOREACH(type)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+# The Sun linker needs to find transitive shared library dependencies
+# in the -L path.
+SET(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
+
+

Index: IRIX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/IRIX.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- IRIX.cmake	31 Jan 2008 12:50:40 -0000	1.13
+++ IRIX.cmake	1 Feb 2008 14:57:41 -0000	1.14
@@ -40,3 +40,7 @@
   SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
   SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
 ENDFOREACH(type)
+
+# The IRIX linker needs to find transitive shared library dependencies
+# in the -L path.
+SET(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)

Index: FreeBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/FreeBSD.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FreeBSD.cmake	18 Apr 2007 03:41:51 -0000	1.10
+++ FreeBSD.cmake	1 Feb 2008 14:57:41 -0000	1.11
@@ -5,6 +5,7 @@
   SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
   SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
   SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
+  SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
   SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
   SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
   SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")

Index: HP-UX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/HP-UX.cmake,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- HP-UX.cmake	22 Jan 2008 14:13:03 -0000	1.25
+++ HP-UX.cmake	1 Feb 2008 14:57:41 -0000	1.26
@@ -6,6 +6,7 @@
 # in the -L path.  Therefore the runtime path must be added to the
 # link line with -L flags.
 SET(CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH 1)
+SET(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
 
 # fortran
 IF(CMAKE_COMPILER_IS_GNUG77)

Index: IRIX64.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/IRIX64.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- IRIX64.cmake	31 Jan 2008 12:50:40 -0000	1.18
+++ IRIX64.cmake	1 Feb 2008 14:57:41 -0000	1.19
@@ -70,3 +70,6 @@
   SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
 ENDFOREACH(type)
 
+# The IRIX linker needs to find transitive shared library dependencies
+# in the -L path.
+SET(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)



More information about the Cmake-commits mailing list