[cmake-commits] king committed FreeBSD.cmake 1.11 1.12 HP-UX.cmake
1.28 1.29 Linux.cmake 1.17 1.18 QNX.cmake 1.10 1.11 SunOS.cmake
1.22 1.23
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Feb 21 11:41:12 EST 2008
Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv23263/Modules/Platform
Modified Files:
FreeBSD.cmake HP-UX.cmake Linux.cmake QNX.cmake SunOS.cmake
Log Message:
ENH: Better linker search path computation.
- Use linker search path -L.. -lfoo for lib w/out soname
when platform sets CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME
- Rename cmOrderRuntimeDirectories to cmOrderDirectories
and generalize it for both soname constraints and link
library constraints
- Use cmOrderDirectories to order -L directories based
on all needed constraints
- Avoid processing implicit link directories
- For CMAKE_OLD_LINK_PATHS add constraints from libs
producing them to produce old ordering
Index: SunOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/SunOS.cmake,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- SunOS.cmake 1 Feb 2008 14:57:41 -0000 1.22
+++ SunOS.cmake 21 Feb 2008 16:41:10 -0000 1.23
@@ -103,4 +103,6 @@
# in the -L path.
SET(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
-
+# Shared libraries with no builtin soname may not be linked safely by
+# specifying the file path.
+SET(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
Index: Linux.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Linux.cmake 1 Feb 2008 13:56:00 -0000 1.17
+++ Linux.cmake 21 Feb 2008 16:41:10 -0000 1.18
@@ -12,6 +12,10 @@
SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic")
+# Shared libraries with no builtin soname may not be linked safely by
+# specifying the file path.
+SET(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
+
# Initialize C 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
Index: QNX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/QNX.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- QNX.cmake 1 Feb 2008 13:56:00 -0000 1.10
+++ QNX.cmake 21 Feb 2008 16:41:10 -0000 1.11
@@ -19,6 +19,10 @@
SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic")
+# Shared libraries with no builtin soname may not be linked safely by
+# specifying the file path.
+SET(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
+
# Initialize C 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
Index: HP-UX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/HP-UX.cmake,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- HP-UX.cmake 18 Feb 2008 17:01:41 -0000 1.28
+++ HP-UX.cmake 21 Feb 2008 16:41:10 -0000 1.29
@@ -8,6 +8,10 @@
SET(CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH 1)
SET(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
+# Shared libraries with no builtin soname may not be linked safely by
+# specifying the file path.
+SET(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
+
# fortran
IF(CMAKE_COMPILER_IS_GNUG77)
SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC") # -pic
Index: FreeBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/FreeBSD.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- FreeBSD.cmake 1 Feb 2008 14:57:41 -0000 1.11
+++ FreeBSD.cmake 21 Feb 2008 16:41:10 -0000 1.12
@@ -12,6 +12,10 @@
SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic")
ENDIF(EXISTS /usr/include/dlfcn.h)
+# Shared libraries with no builtin soname may not be linked safely by
+# specifying the file path.
+SET(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
+
# Initialize C 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
More information about the Cmake-commits
mailing list