ENH: change find library and find program to look for more than one name

6 files changed, 19 insertions, 76 deletions

diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake
index 6063b57..6616db0 100644
--- a/Modules/FindFLTK.cmake
+++ b/Modules/FindFLTK.cmake
@@ -10,10 +10,7 @@ FIND_PATH(FLTK_INCLUDE_PATH FL/FL.H
 H:/usr/local/fltk
 )
 
-FIND_LIBRARY(FLTK_LIB_PATH fltk
-/usr/lib
-/usr/local/lib
-/usr/local/fltk/lib
-H:/usr/local/fltk/lib
+FIND_LIBRARY(FLTK_LIB_PATH  fltk
+PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib H:/usr/local/fltk/lib
 )
 
diff --git a/Modules/FindGTK.cmake b/Modules/FindGTK.cmake
index 06144af..df6277e 100644
--- a/Modules/FindGTK.cmake
+++ b/Modules/FindGTK.cmake
@@ -11,14 +11,11 @@ IF (UNIX)
   /usr/openwin/share/include
   )
 
-  FIND_LIBRARY(GTK_LIB_PATH gtk
-  /usr/lib
-  /usr/local/lib
-  /usr/openwin/lib
-  /usr/X11R6/lib
+  FIND_LIBRARY(GTK_LIB_PATH  gtk
+  PATHS /usr/lib  /usr/local/lib  /usr/openwin/lib  /usr/X11R6/lib
   )
 
-  FIND_LIBRARY(GTK_GLIB_INCLUDE_PATH glibconfig.h
+  FIND_PATH(GTK_GLIB_INCLUDE_PATH glibconfig.h
   /usr/include
   /usr/local/include
   /usr/openwin/share/include
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index cec9f13..a58bada 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -8,7 +8,7 @@
 #  JAVA_AWT_INCLUDE_PATH = the path to where jni.h can be found
 # 
         
-FIND_LIBRARY(JAVA_AWT_LIB_PATH jawt /usr/lib /usr/local/lib)
+FIND_LIBRARY(JAVA_AWT_LIB_PATH jawt PATHS /usr/lib /usr/local/lib)
 
 # add in the include path    
 FIND_PATH(JAVA_INCLUDE_PATH jni.h /usr/include /usr/local/include)
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index 907c503..a72aa51 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -8,8 +8,7 @@ FIND_PATH(NATIVE_JPEG_INCLUDE_PATH jpeglib.h
 /usr/include
 )
 
-FIND_LIBRARY(NATIVE_JPEG_LIB_PATH jpeg
-/usr/lib
-/usr/local/lib
+FIND_LIBRARY(NATIVE_JPEG_LIB_PATH  jpeg
+PATHS /usr/lib /usr/local/lib
 )
 
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 72ee7d6..7f7efb0 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -3,24 +3,12 @@
 # it will define the following values
 #
 # MPI_INCLUDE_PATH = where mpi.h can be found
-# MPI_LIB_PATH     = path to the mpi library
 # MPI_LIBRARY      = the library to link against (mpi mpich etc)
 #
 
 FIND_PATH(MPI_INCLUDE_PATH mpi.h /usr/local/include /usr/include /usr/local/mpi/include)
 
-# look for the different MPI libs
-IF (NOT MPI_LIB_PATH)
-  FIND_LIBRARY(MPI_LIB_PATH mpi /usr/lib /usr/local/lib /usr/local/mpi/lib)
-  IF (MPI_LIB_PATH)
-    SET (MPI_LIBRARY mpi CACHE)
-  ENDIF (MPI_LIB_PATH)
-ENDIF (NOT MPI_LIB_PATH)
-
-IF (NOT MPI_LIB_PATH)
-  FIND_LIBRARY(MPI_LIB_PATH mpich /usr/lib /usr/local/lib /usr/local/mpi/lib)
-  IF (MPI_LIB_PATH)
-    SET (MPI_LIBRARY mpich CACHE)
-  ENDIF (MPI_LIB_PATH)
-ENDIF (NOT MPI_LIB_PATH)
+FIND_LIBRARY(MPI_LIBRARY 
+             NAMES mpi mpich
+             PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib)
 
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 0f864b1..e661917 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -3,58 +3,20 @@
 # include files and libraries are. It also determines what the name of
 # the library is. This code sets the following variables:
 #
-#  TCL_LIB_PATH     = the path to where the TCL library is
-#  TCL_LIBRARY      = the name of the tcl library found (tcl tcl80 etc)
+#  TCL_LIBRARY      = the full path to the tcl library found (tcl tcl80 etc)
 #  TCL_INCLUDE_PATH = the path to where tcl.h can be found
-#  TK_LIB_PATH      = the path to where the TK library is
-#  TK_LIBRARY       = the name of the tk library found (tk tk80 etc)
+#  TK_LIBRARY       = the full path to the tk library found (tk tk80 etc)
 #  TK_INCLUDE_PATH  = the path to where tk.h can be found
 #
-# 
 
 # try to find the Tcl libraries in a few places and names
-IF (NOT TCL_LIB_PATH)
-  FIND_LIBRARY(TCL_LIB_PATH tcl "C:/Program Files/Tcl/lib" /usr/lib /usr/local/lib)
-  IF (TCL_LIB_PATH)
-    SET (TCL_LIBRARY tcl CACHE)
-  ENDIF (TCL_LIB_PATH)
-ENDIF (NOT TCL_LIB_PATH)
+FIND_LIBRARY(TCL_LIBRARY
+             NAMES tcl tcl82 tcl80 
+             PATHS  /usr/lib "C:/Program Files/Tcl/lib" /usr/local/lib)
 
-IF (NOT TCL_LIB_PATH)
-  FIND_LIBRARY(TCL_LIB_PATH tcl82 "C:/Program Files/Tcl/lib" /usr/lib /usr/local/lib)
-  IF (TCL_LIB_PATH)
-    SET (TCL_LIBRARY tcl82 CACHE)
-  ENDIF (TCL_LIB_PATH)
-ENDIF (NOT TCL_LIB_PATH)
-
-IF (NOT TCL_LIB_PATH)
-  FIND_LIBRARY(TCL_LIB_PATH tcl80 "C:/Program Files/Tcl/lib" /usr/lib /usr/local/lib)
-  IF (TCL_LIB_PATH)
-    SET (TCL_LIBRARY tcl80 CACHE)
-  ENDIF (TCL_LIB_PATH)
-ENDIF (NOT TCL_LIB_PATH)
-
-# try to find the Tk libraries in a few places and names
-IF (NOT TK_LIB_PATH)
-  FIND_LIBRARY(TK_LIB_PATH tk "C:/Program Files/Tcl/lib" /usr/lib /usr/local/lib)
-  IF (TK_LIB_PATH)
-    SET (TK_LIBRARY tk CACHE)
-  ENDIF (TK_LIB_PATH)
-ENDIF (NOT TK_LIB_PATH)
-
-IF (NOT TK_LIB_PATH)
-  FIND_LIBRARY(TK_LIB_PATH tk82 "C:/Program Files/Tcl/lib" /usr/lib /usr/local/lib)
-  IF (TK_LIB_PATH)
-    SET (TK_LIBRARY tk82 CACHE)
-  ENDIF (TK_LIB_PATH)
-ENDIF (NOT TK_LIB_PATH)
-
-IF (NOT TK_LIB_PATH)
-  FIND_LIBRARY(TK_LIB_PATH tk80 "C:/Program Files/Tcl/lib" /usr/lib /usr/local/lib)
-  IF (TK_LIB_PATH)
-    SET (TK_LIBRARY tk80 CACHE)
-  ENDIF (TK_LIB_PATH)
-ENDIF (NOT TK_LIB_PATH)
+FIND_LIBRARY(TK_LIBRARY 
+             NAMES tk tk82 tk80
+             PATHS /usr/lib "C:/Program Files/Tcl/lib" /usr/local/lib)
 
 # add in the include path    
 FIND_PATH(TCL_INCLUDE_PATH tcl.h "C:/Program Files/Tcl/include" /usr/include /usr/local/include)