From 290ffc01b64d18e694a960f432ed198a8d4ab290 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Apr 2005 14:27:01 -0400 Subject: [PATCH] ENH: Removing extra 64-bit search paths. They are now constructed automatically from the paths listed. --- Modules/CMakeDetermineJavaCompiler.cmake | 1 - Modules/FindAVIFile.cmake | 1 - Modules/FindFLTK.cmake | 9 ++++---- Modules/FindGLUT.cmake | 8 ------- Modules/FindGTK.cmake | 28 +++++------------------- Modules/FindJNI.cmake | 3 --- Modules/FindJPEG.cmake | 1 - Modules/FindJava.cmake | 1 - Modules/FindMPEG.cmake | 2 -- Modules/FindMPEG2.cmake | 2 -- Modules/FindOpenGL.cmake | 8 +------ Modules/FindPHP4.cmake | 1 - Modules/FindPNG.cmake | 3 +-- Modules/FindPerlLibs.cmake | 2 -- Modules/FindPythonLibs.cmake | 3 --- Modules/FindQt.cmake | 15 ------------- Modules/FindRuby.cmake | 1 - Modules/FindSDL.cmake | 1 - Modules/FindSWIG.cmake | 2 -- Modules/FindTCL.cmake | 1 - Modules/FindTIFF.cmake | 1 - Modules/FindX11.cmake | 2 -- Modules/FindZLIB.cmake | 1 - 23 files changed, 12 insertions(+), 85 deletions(-) diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake index df779b021..03e7719c3 100644 --- a/Modules/CMakeDetermineJavaCompiler.cmake +++ b/Modules/CMakeDetermineJavaCompiler.cmake @@ -38,7 +38,6 @@ 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 cc7c461ba..f1de1a20a 100644 --- a/Modules/FindAVIFile.cmake +++ b/Modules/FindAVIFile.cmake @@ -21,7 +21,6 @@ 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 013c4e7b5..8c83fe72d 100644 --- a/Modules/FindFLTK.cmake +++ b/Modules/FindFLTK.cmake @@ -73,26 +73,25 @@ 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/lib64 /usr/X11R6/lib ${FLTK_INCLUDE_DIR}/lib + /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/lib64 /usr/X11R6/lib ${FLTK_INCLUDE_DIR}/lib + /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/lib64 /usr/X11R6/lib ${FLTK_INCLUDE_DIR}/lib + /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/lib64 /usr/X11R6/lib ${FLTK_INCLUDE_DIR}/lib + /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 3e9e99946..16d5f2750 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -20,11 +20,9 @@ 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 ) @@ -66,29 +64,23 @@ 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 e185a16d5..81158a06c 100644 --- a/Modules/FindGTK.cmake +++ b/Modules/FindGTK.cmake @@ -33,7 +33,6 @@ 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 @@ -46,7 +45,6 @@ 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 @@ -62,11 +60,9 @@ 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 ) @@ -77,66 +73,54 @@ IF(UNIX) FIND_LIBRARY( GTK_gtk_LIBRARY NAMES gtk gtk12 - PATHS /usr/lib64 - /usr/lib + PATHS /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/lib64 - /usr/lib + PATHS /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/lib64 - /usr/lib + PATHS /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/lib64 - /usr/lib + PATHS /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/lib64 - /usr/lib + PATHS /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/lib64 - /usr/lib + PATHS /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 1822c4ed3..9a9f3ead5 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -11,10 +11,8 @@ 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 @@ -25,7 +23,6 @@ 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 5b335c072..e81e8bf9e 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -15,7 +15,6 @@ 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 4f5848714..cc05b2402 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -17,7 +17,6 @@ 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 56cdb03e7..734c4f07e 100644 --- a/Modules/FindMPEG.cmake +++ b/Modules/FindMPEG.cmake @@ -18,14 +18,12 @@ 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 b8aed246f..21e0724c9 100644 --- a/Modules/FindMPEG2.cmake +++ b/Modules/FindMPEG2.cmake @@ -18,14 +18,12 @@ 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 eaf9efb7c..c20aaaf82 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -30,13 +30,11 @@ 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 ) @@ -83,12 +81,10 @@ ELSE (WIN32) FIND_LIBRARY(OPENGL_gl_LIBRARY NAMES GL MesaGL - PATHS /usr/lib64 - /usr/lib + PATHS /usr/lib /usr/local/lib /opt/graphics/OpenGL/lib /usr/openwin/lib - /usr/X11R6/lib64 /usr/X11R6/lib /usr/shlib ) @@ -110,12 +106,10 @@ 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 e3968eb9b..e38413fce 100644 --- a/Modules/FindPHP4.cmake +++ b/Modules/FindPHP4.cmake @@ -16,7 +16,6 @@ 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 845b9cbea..3ddf05e29 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -23,9 +23,8 @@ IF(ZLIB_FOUND) ) FIND_LIBRARY(PNG_LIBRARY png - /usr/local/lib - /usr/lib64 /usr/lib + /usr/local/lib ) IF (PNG_LIBRARY) diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake index 4854f7e4c..dfdc47f8c 100644 --- a/Modules/FindPerlLibs.cmake +++ b/Modules/FindPerlLibs.cmake @@ -13,11 +13,9 @@ 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 1913caf1d..df9b0fd29 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -40,8 +40,6 @@ 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 @@ -49,7 +47,6 @@ 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 f89536c1c..39523e231 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -24,10 +24,7 @@ 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 @@ -55,10 +52,7 @@ 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 @@ -71,10 +65,7 @@ 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 @@ -102,10 +93,7 @@ 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 ) @@ -118,10 +106,7 @@ 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 fa5a2d1f7..dfc811a7d 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -12,7 +12,6 @@ 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 e6d52c5d2..d0a450f4c 100644 --- a/Modules/FindSDL.cmake +++ b/Modules/FindSDL.cmake @@ -15,7 +15,6 @@ IF (UNIX) FIND_LIBRARY(SDL_LIBRARY SDL $ENV{SDLDIR}/lib - /usr/lib64 /usr/lib /usr/local/lib ) diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake index c702ae2ba..5d2ae9be1 100644 --- a/Modules/FindSWIG.cmake +++ b/Modules/FindSWIG.cmake @@ -2,13 +2,11 @@ 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 e78e7799c..365ab112f 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -36,7 +36,6 @@ 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 954e09b9b..46b55ebdb 100644 --- a/Modules/FindTIFF.cmake +++ b/Modules/FindTIFF.cmake @@ -15,7 +15,6 @@ 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 8ff89b2b3..a804b79a0 100644 --- a/Modules/FindX11.cmake +++ b/Modules/FindX11.cmake @@ -20,11 +20,9 @@ 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 9194fdd27..cb23b6dec 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -11,7 +11,6 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h ) FIND_LIBRARY(ZLIB_LIBRARY z - /usr/lib64 /usr/lib /usr/local/lib )