[cmake-commits] king committed IRIX.cmake 1.12 1.13 IRIX64.cmake 1.17 1.18

[cmake-commits at cmake.org]

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

Modified Files:
	IRIX.cmake IRIX64.cmake 
Log Message:
BUG: Move decision to switch library paths found in implicit link directories to use -l options from cmFindLibraryCommand to cmComputeLinkInformation.  Existing projects may depend on find_library returning a full path.  This slightly weakens cmComputeLinkInformation but is necessary for compatibility.


Index: IRIX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/IRIX.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- IRIX.cmake	9 Aug 2006 17:14:48 -0000	1.12
+++ IRIX.cmake	31 Jan 2008 12:50:40 -0000	1.13
@@ -31,3 +31,12 @@
     "mv `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.s <ASSEMBLY_SOURCE>"
     )
 ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
+
+# 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
+# versions of the libraries.
+FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
+  SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
+  SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
+ENDFOREACH(type)

Index: IRIX64.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/IRIX64.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- IRIX64.cmake	9 Aug 2006 17:14:48 -0000	1.17
+++ IRIX64.cmake	31 Jan 2008 12:50:40 -0000	1.18
@@ -60,3 +60,13 @@
     "mv `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.s <ASSEMBLY_SOURCE>"
     )
 ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
+
+# 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
+# versions of the libraries.
+FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
+  SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
+  SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
+ENDFOREACH(type)
+