Commit 290ffc01 authored by Brad King's avatar Brad King

ENH: Removing extra 64-bit search paths. They are now constructed...

ENH: Removing extra 64-bit search paths.  They are now constructed automatically from the paths listed.
parent 1c73f2f7
......@@ -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
......
......@@ -21,7 +21,6 @@ IF (UNIX)
FIND_LIBRARY(AVIFILE_AVIPLAY_LIBRARY aviplay
/usr/local/avifile/lib
/usr/local/lib
/usr/lib64
/usr/lib
)
......
......@@ -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
......
......@@ -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
)
......
......@@ -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
)
......
......@@ -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
......
......@@ -15,7 +15,6 @@ FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
)
FIND_LIBRARY(JPEG_LIBRARY jpeg
/usr/lib64
/usr/lib
/usr/local/lib
)
......
......@@ -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
......
......@@ -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
)
......
......@@ -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
)
......
......@@ -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
)
......
......@@ -16,7 +16,6 @@ SET(PHP4_POSSIBLE_INCLUDE_PATHS
)
SET(PHP4_POSSIBLE_LIB_PATHS
/usr/lib64
/usr/lib
)
......
......@@ -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)
......
......@@ -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
)
......
......@@ -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
......
......@@ -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
)
......
......@@ -12,7 +12,6 @@ SET(RUBY_POSSIBLE_INCLUDE_PATHS
)
SET(RUBY_POSSIBLE_LIB_PATHS
/usr/lib64
/usr/lib
)
......
......@@ -15,7 +15,6 @@ IF (UNIX)
FIND_LIBRARY(SDL_LIBRARY SDL
$ENV{SDLDIR}/lib
/usr/lib64
/usr/lib
/usr/local/lib
)
......
......@@ -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})
......
......@@ -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
)
......
......@@ -15,7 +15,6 @@ FIND_PATH(TIFF_INCLUDE_DIR tiff.h
)
FIND_LIBRARY(TIFF_LIBRARY tiff
/usr/lib64
/usr/lib
/usr/local/lib
)
......
......@@ -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
)
......
......@@ -11,7 +11,6 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
)
FIND_LIBRARY(ZLIB_LIBRARY z
/usr/lib64
/usr/lib
/usr/local/lib
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment