[cmake-commits] king committed Linux.cmake 1.14 1.15 UnixPaths.cmake 1.7 1.8

[cmake-commits at cmake.org]

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

Modified Files:
	Linux.cmake UnixPaths.cmake 
Log Message:
ENH: Added global property FIND_LIBRARY_USE_LIB64_PATHS to allow lib64 paths to be searched optionally.  Turn off the feature on debian systems.  This addresses debian report 419007.


Index: Linux.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Linux.cmake	7 May 2007 22:17:32 -0000	1.14
+++ Linux.cmake	27 Jun 2007 16:07:34 -0000	1.15
@@ -48,3 +48,9 @@
 ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
 
 INCLUDE(Platform/UnixPaths)
+
+# Debian has lib64 paths only for compatibility so they should not be
+# searched.
+IF(EXISTS "/etc/debian_version")
+  SET_PROPERTIES(GLOBAL PROPERTIES FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+ENDIF(EXISTS "/etc/debian_version")

Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- UnixPaths.cmake	18 May 2007 15:36:23 -0000	1.7
+++ UnixPaths.cmake	27 Jun 2007 16:07:34 -0000	1.8
@@ -37,3 +37,5 @@
   /lib /usr/lib /usr/lib32 /usr/lib64
   )
 
+# Enable use of lib64 search path variants by default.
+SET_PROPERTIES(GLOBAL PROPERTIES FIND_LIBRARY_USE_LIB64_PATHS TRUE)