ENH: Adding support for 64-bit library paths. Contributed by Peter Vanroose.

23 files changed, 86 insertions, 13 deletions

diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake
index 03e7719c32..df779b0216 100644
--- a/Modules/CMakeDetermineJavaCompiler.cmake
+++ b/Modules/CMakeDetermineJavaCompiler.cmake
@@ -38,6 +38,7 @@ IF(NOT CMAKE_Java_COMPILER)
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
     /usr/bin
+    /usr/lib64/java/bin
     /usr/lib/java/bin
     /usr/share/java/bin
     /usr/local/bin
diff --git a/Modules/FindAVIFile.cmake b/Modules/FindAVIFile.cmake
index f1de1a20a2..cc7c461ba5 100644
--- a/Modules/FindAVIFile.cmake
+++ b/Modules/FindAVIFile.cmake
@@ -21,6 +21,7 @@ IF (UNIX)
   FIND_LIBRARY(AVIFILE_AVIPLAY_LIBRARY aviplay
     /usr/local/avifile/lib
     /usr/local/lib
+    /usr/lib64
     /usr/lib
   )
 
diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake
index 8c83fe72da..013c4e7b59 100644
--- a/Modules/FindFLTK.cmake
+++ b/Modules/FindFLTK.cmake
@@ -73,25 +73,26 @@ IF(FLTK_INCLUDE_DIR)
            PATHS /usr/lib /usr/local/lib
            /usr/local/lib/fltk
            /usr/local/fltk/lib
+           /usr/X11R6/lib64
            /usr/X11R6/lib ${FLTK_INCLUDE_DIR}/lib
       )
   ENDIF(FLTK_VERSION_1.0.11)
   IF(FLTK_VERSION_1.1)
     FIND_LIBRARY(FLTK_BASE_LIBRARY  NAMES fltk fltkd
       PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib
-      /usr/X11R6/lib  ${FLTK_INCLUDE_DIR}/lib
+      /usr/X11R6/lib64 /usr/X11R6/lib  ${FLTK_INCLUDE_DIR}/lib
     )
     FIND_LIBRARY(FLTK_GL_LIBRARY NAMES fltkgl fltkgld fltk_gl
       PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib
-      /usr/X11R6/lib ${FLTK_INCLUDE_DIR}/lib
+      /usr/X11R6/lib64 /usr/X11R6/lib ${FLTK_INCLUDE_DIR}/lib
     )
     FIND_LIBRARY(FLTK_FORMS_LIBRARY NAMES fltkforms fltkformsd fltk_forms
       PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib
-      /usr/X11R6/lib  ${FLTK_INCLUDE_DIR}/lib
+      /usr/X11R6/lib64 /usr/X11R6/lib  ${FLTK_INCLUDE_DIR}/lib
     )
     FIND_LIBRARY(FLTK_IMAGES_LIBRARY NAMES fltkimages fltkimagesd fltk_images
       PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib
-      /usr/X11R6/lib  ${FLTK_INCLUDE_DIR}/lib
+      /usr/X11R6/lib64 /usr/X11R6/lib  ${FLTK_INCLUDE_DIR}/lib
     )
   ENDIF(FLTK_VERSION_1.1)
   SET( FLTK_LIBRARIES 
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
index 16d5f2750e..3e9e99946b 100644
--- a/Modules/FindGLUT.cmake
+++ b/Modules/FindGLUT.cmake
@@ -20,9 +20,11 @@ IF (WIN32)
 
     FIND_LIBRARY( GLUT_glut_LIBRARY glut32
       ${OPENGL_LIBRARY_DIR}
+      /usr/lib64
       /usr/lib
       /usr/lib/w32api
       /usr/local/lib
+      /usr/X11R6/lib64
       /usr/X11R6/lib
     )
 
@@ -64,23 +66,29 @@ ELSE (WIN32)
     )
 
     FIND_LIBRARY( GLUT_glut_LIBRARY glut
+      /usr/lib64
       /usr/lib
       /usr/local/lib
       /usr/openwin/lib
+      /usr/X11R6/lib64
       /usr/X11R6/lib
     )
 
     FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
+      /usr/lib64
       /usr/lib
       /usr/local/lib
       /usr/openwin/lib
+      /usr/X11R6/lib64
       /usr/X11R6/lib
     )
 
     FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
+      /usr/lib64
       /usr/lib
       /usr/local/lib
       /usr/openwin/lib
+      /usr/X11R6/lib64
       /usr/X11R6/lib
     )
 
diff --git a/Modules/FindGTK.cmake b/Modules/FindGTK.cmake
index 81158a06c2..e185a16d5d 100644
--- a/Modules/FindGTK.cmake
+++ b/Modules/FindGTK.cmake
@@ -33,6 +33,7 @@ IF(UNIX)
     /usr/local/include
     /usr/openwin/share/include
     /usr/local/include/glib12
+    /usr/lib64/glib/include
     /usr/lib/glib/include
     /usr/local/lib/glib/include
     /opt/gnome/include
@@ -45,6 +46,7 @@ IF(UNIX)
     /usr/openwin/share/include
     /usr/include/gtk-1.2
     /usr/local/include/glib12
+    /usr/lib64/glib/include
     /usr/lib/glib/include
     /usr/include/glib-1.2
     /usr/local/include/glib-1.2
@@ -60,9 +62,11 @@ IF(UNIX)
   )
 
   FIND_LIBRARY( GTK_gtkgl_LIBRARY gtkgl
+    /usr/lib64
     /usr/lib
     /usr/local/lib
     /usr/openwin/lib
+    /usr/X11R6/lib64
     /usr/X11R6/lib
     /opt/gnome/lib
   )
@@ -73,54 +77,66 @@ IF(UNIX)
 
   FIND_LIBRARY( GTK_gtk_LIBRARY
     NAMES  gtk gtk12
-    PATHS /usr/lib
+    PATHS /usr/lib64
+          /usr/lib
           /usr/local/lib
           /usr/openwin/lib
+          /usr/X11R6/lib64
           /usr/X11R6/lib
           /opt/gnome/lib
   )
 
   FIND_LIBRARY( GTK_gdk_LIBRARY
     NAMES  gdk gdk12
-    PATHS  /usr/lib
+    PATHS  /usr/lib64
+           /usr/lib
            /usr/local/lib
            /usr/openwin/lib
+           /usr/X11R6/lib64
            /usr/X11R6/lib
            /opt/gnome/lib
   )
 
   FIND_LIBRARY( GTK_gmodule_LIBRARY
     NAMES  gmodule gmodule12
-    PATHS  /usr/lib
+    PATHS  /usr/lib64
+           /usr/lib
            /usr/local/lib
            /usr/openwin/lib
+           /usr/X11R6/lib64
            /usr/X11R6/lib
            /opt/gnome/lib
   )
 
   FIND_LIBRARY( GTK_glib_LIBRARY
     NAMES  glib glib12
-    PATHS  /usr/lib
+    PATHS  /usr/lib64
+           /usr/lib
            /usr/local/lib
            /usr/openwin/lib
+           /usr/X11R6/lib64
            /usr/X11R6/lib
            /opt/gnome/lib
   )
 
   FIND_LIBRARY( GTK_Xi_LIBRARY 
     NAMES Xi 
-    PATHS /usr/lib 
+    PATHS /usr/lib64
+          /usr/lib 
     /usr/local/lib 
     /usr/openwin/lib 
+    /usr/X11R6/lib64
     /usr/X11R6/lib 
     /opt/gnome/lib 
     ) 
 
   FIND_LIBRARY( GTK_gthread_LIBRARY
     NAMES  gthread gthread12
-    PATHS  /usr/lib
+    PATHS  /usr/lib64
+           /usr/lib
            /usr/local/lib
            /usr/openwin/lib
+           /usr/X11R6/lib64
            /usr/X11R6/lib
            /opt/gnome/lib
   )
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 9a9f3ead5a..1822c4ed35 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -11,8 +11,10 @@
 SET(JAVA_AWT_LIBRARY_DIRECTORIES
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
+  /usr/lib64
   /usr/lib
   /usr/local/lib
+  /usr/lib64/java/jre/lib/i386
   /usr/lib/java/jre/lib/i386
   /usr/local/lib/java/jre/lib/i386
   /usr/lib/j2sdk1.4-sun/jre/lib/i386
@@ -23,6 +25,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
   /usr/include 
   /usr/local/include
+  /usr/lib64/java/include
   /usr/lib/java/include
   /usr/local/lib/java/include
   /usr/lib/j2sdk1.4-sun/include
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index e81e8bf9e8..5b335c0726 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -15,6 +15,7 @@ FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
 )
 
 FIND_LIBRARY(JPEG_LIBRARY jpeg
+/usr/lib64
 /usr/lib
 /usr/local/lib
 )
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index cc05b24025..4f58487141 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -17,6 +17,7 @@ SET(JAVA_BIN_PATH
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
   /usr/bin
+  /usr/lib64/java/bin
   /usr/lib/java/bin
   /usr/share/java/bin
   /usr/local/bin
diff --git a/Modules/FindMPEG.cmake b/Modules/FindMPEG.cmake
index 734c4f07e7..56cdb03e75 100644
--- a/Modules/FindMPEG.cmake
+++ b/Modules/FindMPEG.cmake
@@ -18,12 +18,14 @@ FIND_PATH(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
 
 FIND_LIBRARY(MPEG_mpeg2_LIBRARY mpeg2
   /usr/local/lib
+  /usr/lib64
   /usr/lib
   /usr/local/livid/mpeg2dec/libmpeg2/.libs
 )
 
 FIND_LIBRARY( MPEG_vo_LIBRARY vo
   /usr/local/lib
+  /usr/lib64
   /usr/lib
   /usr/local/livid/mpeg2dec/libvo/.libs
 )
diff --git a/Modules/FindMPEG2.cmake b/Modules/FindMPEG2.cmake
index 21e0724c9a..b8aed246f2 100644
--- a/Modules/FindMPEG2.cmake
+++ b/Modules/FindMPEG2.cmake
@@ -18,12 +18,14 @@ FIND_PATH(MPEG2_INCLUDE_DIR mpeg2.h
 
 FIND_LIBRARY(MPEG2_mpeg2_LIBRARY mpeg2
   /usr/local/lib
+  /usr/lib64
   /usr/lib
   /usr/local/livid/mpeg2dec/libmpeg2/.libs
 )
 
 FIND_LIBRARY( MPEG2_vo_LIBRARY vo
   /usr/local/lib
+  /usr/lib64
   /usr/lib
   /usr/local/livid/mpeg2dec/libvo/.libs
 )
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index c20aaaf825..eaf9efb7cd 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -30,11 +30,13 @@ IF (WIN32)
     )
 
     FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32
+      /usr/lib64
       /usr/lib
       /usr/lib/w32api
     )
 
     FIND_LIBRARY(OPENGL_glu_LIBRARY glu32
+      /usr/lib64
       /usr/lib
       /usr/lib/w32api
     )
@@ -81,10 +83,12 @@ ELSE (WIN32)
 
   FIND_LIBRARY(OPENGL_gl_LIBRARY
     NAMES GL MesaGL
-    PATHS /usr/lib
+    PATHS /usr/lib64
+          /usr/lib
           /usr/local/lib
           /opt/graphics/OpenGL/lib
           /usr/openwin/lib
+          /usr/X11R6/lib64
           /usr/X11R6/lib
           /usr/shlib
   )
@@ -106,10 +110,12 @@ ELSE (WIN32)
   FIND_LIBRARY(OPENGL_glu_LIBRARY
     NAMES GLU MesaGLU
     PATHS ${OPENGL_gl_LIBRARY}
+          /usr/lib64
           /usr/lib
           /usr/local/lib
           /opt/graphics/OpenGL/lib
           /usr/openwin/lib
+          /usr/X11R6/lib64
           /usr/X11R6/lib
           /usr/shlib
   )
diff --git a/Modules/FindPHP4.cmake b/Modules/FindPHP4.cmake
index e38413fcee..e3968eb9be 100644
--- a/Modules/FindPHP4.cmake
+++ b/Modules/FindPHP4.cmake
@@ -16,6 +16,7 @@ SET(PHP4_POSSIBLE_INCLUDE_PATHS
   )
 
 SET(PHP4_POSSIBLE_LIB_PATHS
+  /usr/lib64
   /usr/lib
   )
 
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 3ddf05e29f..845b9cbea4 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -23,8 +23,9 @@ IF(ZLIB_FOUND)
   )
 
   FIND_LIBRARY(PNG_LIBRARY png
-  /usr/lib
   /usr/local/lib
+  /usr/lib64
+  /usr/lib
   )
 
   IF (PNG_LIBRARY)
diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake
index dfdc47f8c3..4854f7e4cc 100644
--- a/Modules/FindPerlLibs.cmake
+++ b/Modules/FindPerlLibs.cmake
@@ -13,9 +13,11 @@ SET(PERL_POSSIBLE_INCLUDE_PATHS
   /usr/lib/perl/5.8.1/CORE
   /usr/lib/perl/5.8.0/CORE
   /usr/lib/perl/5.8/CORE
+  /usr/lib64/perl5/5.8.3/x86_64-linux-thread-multi/CORE
   )
 
 SET(PERL_POSSIBLE_LIB_PATHS
+  /usr/lib64
   /usr/lib
   )
 
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index df9b0fd29e..1913caf1d7 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -40,6 +40,8 @@ FIND_LIBRARY(PYTHON_LIBRARY
         python16 python1.6 python1.6.dll
         python15 python1.5 python1.5.dll
   PATHS
+  /usr/lib64/python2.4/config
+  /usr/lib64/python2.3/config
   /usr/lib/python2.4/config
   /usr/lib/python2.3/config
   /usr/lib/python2.2/config
@@ -47,6 +49,7 @@ FIND_LIBRARY(PYTHON_LIBRARY
   /usr/lib/python2.0/config
   /usr/lib/python1.6/config
   /usr/lib/python1.5/config
+  /usr/lib64
   /usr/lib
   /usr/local/lib
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 39523e231c..f89536c1cb 100644
--- a/Modules/FindQt.cmake
+++ b/Modules/FindQt.cmake
@@ -24,7 +24,10 @@ FIND_PATH(QT_INCLUDE_DIR qt.h
   $ENV{QTDIR}/include
   /usr/local/qt/include
   /usr/local/include
+  /usr/lib64/qt/include
   /usr/lib/qt/include
+  /usr/lib64/qt-3.3/include
+  /usr/lib/qt-3.3/include
   /usr/include/qt
   /usr/include
   /usr/share/qt3/include
@@ -52,7 +55,10 @@ IF (QT_MT_REQUIRED)
         $ENV{QTDIR}/lib
         /usr/local/qt/lib
         /usr/local/lib
+        /usr/lib64/qt/lib
         /usr/lib/qt/lib
+        /usr/lib64/qt-3.3/lib
+        /usr/lib/qt-3.3/lib
         /usr/lib
         /usr/share/qt3/lib
         C:/Progra~1/qt/lib
@@ -65,7 +71,10 @@ ELSE (QT_MT_REQUIRED)
     $ENV{QTDIR}/lib
     /usr/local/qt/lib
     /usr/local/lib
+    /usr/lib64/qt/lib
     /usr/lib/qt/lib
+    /usr/lib64/qt-3.3/lib
+    /usr/lib/qt-3.3/lib
     /usr/lib
     /usr/share/qt3/lib
     C:/Progra~1/qt/lib
@@ -93,7 +102,10 @@ FIND_PROGRAM(QT_MOC_EXECUTABLE
   PATHS
   $ENV{QTDIR}/bin 
   /usr/local/qt/bin
+  /usr/lib64/qt/bin
   /usr/lib/qt/bin
+  /usr/lib64/qt-3.3/bin
+  /usr/lib/qt-3.3/bin
   /usr/share/qt3/bin
   C:/Progra~1/qt/bin
   )
@@ -106,7 +118,10 @@ ENDIF(QT_MOC_EXECUTABLE)
 FIND_PROGRAM(QT_UIC_EXECUTABLE uic
   $ENV{QTDIR}/bin 
   /usr/local/qt/bin
+  /usr/lib64/qt/bin
   /usr/lib/qt/bin
+  /usr/lib64/qt-3.3/bin
+  /usr/lib/qt-3.3/bin
   /usr/share/qt3/bin
   C:/Progra~1/qt/bin
 )
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index dfc811a7d0..fa5a2d1f77 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -12,6 +12,7 @@ SET(RUBY_POSSIBLE_INCLUDE_PATHS
   )
 
 SET(RUBY_POSSIBLE_LIB_PATHS
+  /usr/lib64
   /usr/lib
   )
 
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index a9cce348eb..e6d52c5d2f 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -15,6 +15,7 @@ IF (UNIX)
 
   FIND_LIBRARY(SDL_LIBRARY SDL
     $ENV{SDLDIR}/lib
+    /usr/lib64
     /usr/lib
     /usr/local/lib
   )
@@ -29,5 +30,5 @@ ENDIF (UNIX)
 
 SET( SDL_FOUND "NO" )
 IF(SDL_LIBRARY)
-	SET( SDL_FOUND "YES" )
+  SET( SDL_FOUND "YES" )
 ENDIF(SDL_LIBRARY)
diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake
index 5d2ae9be17..c702ae2ba8 100644
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@ -2,11 +2,13 @@ SET(SWIG_FOUND FOOBAR)
 FIND_PATH(SWIG_DIR
   SWIGConfig.cmake
   /usr/share/swig1.3
+  /usr/lib64/swig1.3
   /usr/lib/swig1.3
   /usr/local/share/swig1.3)
 FIND_PATH(SWIG_DIR
   swig.swg
   /usr/share/swig1.3
+  /usr/lib64/swig1.3
   /usr/lib/swig1.3
   /usr/local/share/swig1.3)
 IF(EXISTS ${SWIG_DIR})
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 365ab112f0..e78e7799cb 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -36,6 +36,7 @@ SET (TCLTK_POSSIBLE_LIB_PATHS
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib
+  /usr/lib64
   /usr/lib 
   /usr/local/lib
 )
diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake
index 46b55ebdba..954e09b9b3 100644
--- a/Modules/FindTIFF.cmake
+++ b/Modules/FindTIFF.cmake
@@ -15,6 +15,7 @@ FIND_PATH(TIFF_INCLUDE_DIR tiff.h
 )
 
 FIND_LIBRARY(TIFF_LIBRARY tiff
+  /usr/lib64
   /usr/lib
   /usr/local/lib
 )
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index a804b79a07..8ff89b2b39 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -20,9 +20,11 @@ IF (UNIX)
   )
 
   SET(X11_LIB_SEARCH_PATH
+    /usr/X11R6/lib64
     /usr/X11R6/lib
     /usr/local/lib 
     /usr/openwin/lib 
+    /usr/lib64
     /usr/lib 
   )
 
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index cb23b6dec0..9194fdd271 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -11,6 +11,7 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
 )
 
 FIND_LIBRARY(ZLIB_LIBRARY z
+  /usr/lib64
   /usr/lib
   /usr/local/lib
 )