--- a/components/cmake/patches/cmake-2.6.2.patch Wed Dec 07 11:40:18 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2085 +0,0 @@
-diff -ru cmake-2.6.2.org//Modules/CMakeDetermineJavaCompiler.cmake cmake-2.6.2/Modules/CMakeDetermineJavaCompiler.cmake
---- cmake-2.6.2.org//Modules/CMakeDetermineJavaCompiler.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/CMakeDetermineJavaCompiler.cmake Thu May 21 16:21:06 2009
-@@ -41,8 +41,9 @@
- /usr/bin
- /usr/lib/java/bin
- /usr/share/java/bin
-- /usr/local/bin
-- /usr/local/java/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
-+# /usr/local/java/bin
- /usr/java/j2sdk1.4.2_04
- /usr/lib/j2sdk1.4-sun/bin
- /usr/lib/j2sdk1.5-sun/bin
-diff -ru cmake-2.6.2.org//Modules/CMakeDetermineSystem.cmake cmake-2.6.2/Modules/CMakeDetermineSystem.cmake
---- cmake-2.6.2.org//Modules/CMakeDetermineSystem.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/CMakeDetermineSystem.cmake Thu May 21 16:21:06 2009
-@@ -29,7 +29,9 @@
-
- # find out on which system cmake runs
- IF(CMAKE_HOST_UNIX)
-- FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
-+ FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin )
-+# Uncomment the following to enable /usr/local search
-+# FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
- IF(CMAKE_UNAME)
- EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
- EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
-diff -ru cmake-2.6.2.org//Modules/FindAVIFile.cmake cmake-2.6.2/Modules/FindAVIFile.cmake
---- cmake-2.6.2.org//Modules/FindAVIFile.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindAVIFile.cmake Thu May 21 16:21:06 2009
-@@ -12,14 +12,16 @@
- IF (UNIX)
-
- FIND_PATH(AVIFILE_INCLUDE_DIR avifile.h
-- /usr/local/avifile/include
-- /usr/local/include/avifile
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/avifile/include
-+# /usr/local/include/avifile
- /usr/include
- )
-
- FIND_LIBRARY(AVIFILE_AVIPLAY_LIBRARY aviplay
-- /usr/local/avifile/lib
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/avifile/lib
-+# /usr/local/lib
- /usr/lib
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindBLAS.cmake cmake-2.6.2/Modules/FindBLAS.cmake
---- cmake-2.6.2.org//Modules/FindBLAS.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindBLAS.cmake Thu May 21 16:21:06 2009
-@@ -72,7 +72,9 @@
- endif(BLA_STATIC)
- find_library(${_prefix}_${_library}_LIBRARY
- NAMES ${_library}
-- PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
-+ PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV DYLD_LIBRARY_PATH
-+# Uncomment the following to enable /usr/local search
-+# PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
- )
-
- else ( APPLE )
-@@ -81,7 +83,9 @@
- endif(BLA_STATIC)
- find_library(${_prefix}_${_library}_LIBRARY
- NAMES ${_library}
-- PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
-+ PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV LD_LIBRARY_PATH
-+# Uncomment the following to enable /usr/local search
-+# PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
- )
- endif( APPLE )
- mark_as_advanced(${_prefix}_${_library}_LIBRARY)
-diff -ru cmake-2.6.2.org//Modules/FindFLTK.cmake cmake-2.6.2/Modules/FindFLTK.cmake
---- cmake-2.6.2.org//Modules/FindFLTK.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindFLTK.cmake Thu May 21 16:21:06 2009
-@@ -78,11 +78,14 @@
- ${FLTK_DIR_SEARCH}
-
- # Look in standard UNIX install locations.
-- /usr/local/lib/fltk
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib/fltk
- /usr/lib/fltk
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/include
-- /usr/local/fltk
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/fltk
- /usr/X11R6/include
-
- # Read from the CMakeSetup registry entries. It is likely that
-@@ -173,7 +176,8 @@
- ENDIF(FLTK_FLUID_EXECUTABLE)
-
- SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH}
-- /usr/local/fltk
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/fltk
- /usr/X11R6/include
- )
-
-@@ -180,7 +184,8 @@
- FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.h ${FLTK_INCLUDE_SEARCH_PATH})
-
- SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
-- /usr/local/fltk/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/fltk/lib
- /usr/X11R6/lib
- ${FLTK_INCLUDE_DIR}/lib
- )
-diff -ru cmake-2.6.2.org//Modules/FindFLTK2.cmake cmake-2.6.2/Modules/FindFLTK2.cmake
---- cmake-2.6.2.org//Modules/FindFLTK2.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindFLTK2.cmake Thu May 21 16:21:07 2009
-@@ -74,11 +74,14 @@
- ${FLTK2_DIR_SEARCH}
-
- # Look in standard UNIX install locations.
-- /usr/local/lib/fltk2
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib/fltk2
- /usr/lib/fltk2
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/include
-- /usr/local/fltk2
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/fltk2
- /usr/X11R6/include
-
- # Read from the CMakeSetup registry entries. It is likely that
-@@ -184,9 +187,11 @@
- ENDIF(FLTK2_FLUID_EXECUTABLE)
-
- SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH}
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/include
-- /usr/local/fltk2
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/fltk2
- /usr/X11R6/include
- )
-
-@@ -194,8 +199,9 @@
-
- SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH}
- /usr/lib
-- /usr/local/lib
-- /usr/local/fltk2/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
-+# /usr/local/fltk2/lib
- /usr/X11R6/lib
- ${FLTK2_INCLUDE_DIR}/lib
- )
-diff -ru cmake-2.6.2.org//Modules/FindFreetype.cmake cmake-2.6.2/Modules/FindFreetype.cmake
---- cmake-2.6.2.org//Modules/FindFreetype.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindFreetype.cmake Thu May 21 16:21:07 2009
-@@ -33,8 +33,9 @@
- $ENV{FREETYPE_DIR}
- PATH_SUFFIXES include
- PATHS
-- /usr/local/X11R6/include
-- /usr/local/X11/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/X11R6/include
-+# /usr/local/X11/include
- /usr/X11/include
- /sw/include
- /opt/local/include
-@@ -45,8 +46,9 @@
- HINTS
- $ENV{FREETYPE_DIR}/include/freetype2
- PATHS
-- /usr/local/X11R6/include
-- /usr/local/X11/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/X11R6/include
-+# /usr/local/X11/include
- /usr/X11/include
- /sw/include
- /opt/local/include
-@@ -60,8 +62,9 @@
- $ENV{FREETYPE_DIR}
- PATH_SUFFIXES lib64 lib
- PATHS
-- /usr/local/X11R6
-- /usr/local/X11
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/X11R6
-+# /usr/local/X11
- /usr/X11
- /sw
- /usr/freeware
-diff -ru cmake-2.6.2.org//Modules/FindGDAL.cmake cmake-2.6.2/Modules/FindGDAL.cmake
---- cmake-2.6.2.org//Modules/FindGDAL.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindGDAL.cmake Thu May 21 16:21:07 2009
-@@ -26,9 +26,10 @@
- PATHS
- ~/Library/Frameworks/gdal.framework/Headers
- /Library/Frameworks/gdal.framework/Headers
-- /usr/local/include/gdal
-- /usr/local/include/GDAL
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/gdal
-+# /usr/local/include/GDAL
-+# /usr/local/include
- /usr/include/gdal
- /usr/include/GDAL
- /usr/include
-@@ -38,9 +39,10 @@
- /opt/local/include/gdal
- /opt/local/include/GDAL
- /opt/local/include # DarwinPorts
-- /opt/csw/include/gdal
-- /opt/csw/include/GDAL
-- /opt/csw/include # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/include/gdal
-+# /opt/csw/include/GDAL
-+# /opt/csw/include # Blastwave
- /opt/include/gdal
- /opt/include/GDAL
- /opt/include
-@@ -54,11 +56,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- /usr/freeware
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
-diff -ru cmake-2.6.2.org//Modules/FindGIF.cmake cmake-2.6.2/Modules/FindGIF.cmake
---- cmake-2.6.2.org//Modules/FindGIF.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindGIF.cmake Thu May 21 16:21:07 2009
-@@ -32,11 +32,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- /usr/freeware
-diff -ru cmake-2.6.2.org//Modules/FindGTK.cmake cmake-2.6.2/Modules/FindGTK.cmake
---- cmake-2.6.2.org//Modules/FindGTK.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindGTK.cmake Thu May 21 16:21:07 2009
-@@ -23,9 +23,11 @@
- FIND_PATH( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h
- PATHS
- /usr/openwin/share/include
-- /usr/local/include/glib12
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/glib12
- /usr/lib/glib/include
-- /usr/local/lib/glib/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib/glib/include
- /opt/gnome/include
- /opt/gnome/lib/glib/include
- )
-diff -ru cmake-2.6.2.org//Modules/FindITK.cmake cmake-2.6.2/Modules/FindITK.cmake
---- cmake-2.6.2.org//Modules/FindITK.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindITK.cmake Thu May 21 16:21:07 2009
-@@ -50,7 +50,8 @@
- ${ITK_DIR_SEARCH}
-
- # Look in standard UNIX install locations.
-- /usr/local/lib/InsightToolkit
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib/InsightToolkit
- /usr/lib/InsightToolkit
-
- # Read from the CMakeSetup registry entries. It is likely that
-diff -ru cmake-2.6.2.org//Modules/FindJNI.cmake cmake-2.6.2/Modules/FindJNI.cmake
---- cmake-2.6.2.org//Modules/FindJNI.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindJNI.cmake Thu May 21 16:21:07 2009
-@@ -23,23 +23,27 @@
- $ENV{JAVA_HOME}/jre/lib/amd64
- $ENV{JAVA_HOME}/jre/lib/ppc
- /usr/lib
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib/jvm/java/lib
- /usr/lib/java/jre/lib/i386
-- /usr/local/lib/java/jre/lib/i386
-- /usr/local/share/java/jre/lib/i386
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib/java/jre/lib/i386
-+# /usr/local/share/java/jre/lib/i386
- /usr/lib/j2sdk1.4-sun/jre/lib/i386
- /usr/lib/j2sdk1.5-sun/jre/lib/i386
- /opt/sun-jdk-1.5.0.04/jre/lib/amd64
- /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64
- /usr/lib/java/jre/lib/amd64
-- /usr/local/lib/java/jre/lib/amd64
-- /usr/local/share/java/jre/lib/amd64
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib/java/jre/lib/amd64
-+# /usr/local/share/java/jre/lib/amd64
- /usr/lib/j2sdk1.4-sun/jre/lib/amd64
- /usr/lib/j2sdk1.5-sun/jre/lib/amd64
- /usr/lib/java/jre/lib/ppc
-- /usr/local/lib/java/jre/lib/ppc
-- /usr/local/share/java/jre/lib/ppc
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib/java/jre/lib/ppc
-+# /usr/local/share/java/jre/lib/ppc
- /usr/lib/j2sdk1.4-sun/jre/lib/ppc
- /usr/lib/j2sdk1.5-sun/jre/lib/ppc
- )
-@@ -61,12 +65,15 @@
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
- $ENV{JAVA_HOME}/include
- /usr/include
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/lib/java/include
-- /usr/local/lib/java/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib/java/include
- /usr/lib/jvm/java/include
- /usr/lib/jvm/java-6-sun-1.6.0.00/include
-- /usr/local/share/java/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/share/java/include
- /usr/lib/j2sdk1.4-sun/include
- /usr/lib/j2sdk1.5-sun/include
- /opt/sun-jdk-1.5.0.04/include
-diff -ru cmake-2.6.2.org//Modules/FindJava.cmake cmake-2.6.2/Modules/FindJava.cmake
---- cmake-2.6.2.org//Modules/FindJava.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindJava.cmake Thu May 21 16:21:07 2009
-@@ -20,9 +20,10 @@
- /usr/bin
- /usr/lib/java/bin
- /usr/share/java/bin
-- /usr/local/bin
-- /usr/local/java/bin
-- /usr/local/java/share/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
-+# /usr/local/java/bin
-+# /usr/local/java/share/bin
- /usr/java/j2sdk1.4.2_04
- /usr/lib/j2sdk1.4-sun/bin
- /usr/java/j2sdk1.4.2_09/bin
-diff -ru cmake-2.6.2.org//Modules/FindKDE3.cmake cmake-2.6.2/Modules/FindKDE3.cmake
---- cmake-2.6.2.org//Modules/FindKDE3.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindKDE3.cmake Thu May 21 16:21:07 2009
-@@ -127,7 +127,8 @@
- /opt/kde3/include
- /opt/kde/include
- /usr/include/kde
-- /usr/local/include/kde
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/kde
- )
-
- #now the KDE library directory
-diff -ru cmake-2.6.2.org//Modules/FindLAPACK.cmake cmake-2.6.2/Modules/FindLAPACK.cmake
---- cmake-2.6.2.org//Modules/FindLAPACK.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindLAPACK.cmake Thu May 21 16:21:07 2009
-@@ -80,7 +80,9 @@
- endif(BLA_STATIC)
- find_library(${_prefix}_${_library}_LIBRARY
- NAMES ${_library}
-- PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
-+ PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV LD_LIBRARY_PATH
-+# Uncomment the following to enable /usr/local search
-+# PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
- )
- endif(APPLE)
-
-diff -ru cmake-2.6.2.org//Modules/FindLua50.cmake cmake-2.6.2/Modules/FindLua50.cmake
---- cmake-2.6.2.org//Modules/FindLua50.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindLua50.cmake Thu May 21 16:21:07 2009
-@@ -19,11 +19,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- )
-
-@@ -31,15 +33,17 @@
- NAMES lua50 lua5.0 lua5 lua
- HINTS
- $ENV{LUA_DIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-@@ -55,11 +59,13 @@
- $ENV{LUA_DIR}
- PATH_SUFFIXES lib64 lib
- PATHS
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
- IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua)
-diff -ru cmake-2.6.2.org//Modules/FindLua51.cmake cmake-2.6.2/Modules/FindLua51.cmake
---- cmake-2.6.2.org//Modules/FindLua51.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindLua51.cmake Thu May 21 16:21:07 2009
-@@ -19,11 +19,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- )
-
-@@ -31,15 +33,17 @@
- NAMES lua51 lua5.1 lua
- HINTS
- $ENV{LUA_DIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindMPI.cmake cmake-2.6.2/Modules/FindMPI.cmake
---- cmake-2.6.2.org//Modules/FindMPI.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindMPI.cmake Thu May 21 16:21:07 2009
-@@ -243,10 +243,12 @@
- set(MPI_LINK_FLAGS ${MPI_LINK_FLAGS_WORK} CACHE STRING "MPI linking flags" FORCE)
- else (MPI_COMPILE_CMDLINE)
- find_path(MPI_INCLUDE_PATH mpi.h
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/include
- /usr/include/mpi
-- /usr/local/mpi/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/mpi/include
- "C:/Program Files/MPICH/SDK/Include"
- "$ENV{SystemDrive}/Program Files/MPICH2/include"
- "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include"
-@@ -261,7 +263,9 @@
-
- find_library(MPI_LIBRARY
- NAMES mpi mpich msmpi
-- PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
-+ PATHS /usr/lib /usr/lib/32 /usr/lib/64
-+# Uncomment the following to enable /usr/local search
-+# PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
- "C:/Program Files/MPICH/SDK/Lib"
- "$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
- "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/${MS_MPI_ARCH_DIR}"
-@@ -273,7 +277,9 @@
-
- find_library(MPI_EXTRA_LIBRARY
- NAMES mpi++
-- PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
-+ PATHS /usr/lib /usr/lib/32 /usr/lib/64
-+# Uncomment the following to enable /usr/local search
-+# PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
- "C:/Program Files/MPICH/SDK/Lib"
- DOC "Extra MPI libraries to link against.")
-
-diff -ru cmake-2.6.2.org//Modules/FindOpenAL.cmake cmake-2.6.2/Modules/FindOpenAL.cmake
---- cmake-2.6.2.org//Modules/FindOpenAL.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindOpenAL.cmake Thu May 21 16:21:07 2009
-@@ -55,11 +55,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
- )
-@@ -68,15 +70,17 @@
- NAMES OpenAL al openal OpenAL32
- HINTS
- $ENV{OPENALDIR}
-- PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64 libs64 libs libs/Win32 libs/Win64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
- )
-diff -ru cmake-2.6.2.org//Modules/FindOpenThreads.cmake cmake-2.6.2/Modules/FindOpenThreads.cmake
---- cmake-2.6.2.org//Modules/FindOpenThreads.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindOpenThreads.cmake Thu May 21 16:21:07 2009
-@@ -51,11 +51,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/include
- /sw/include # Fink
- /opt/local/include # DarwinPorts
-- /opt/csw/include # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/include # Blastwave
- /opt/include
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-@@ -79,16 +81,20 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local/lib64
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib64
-+# /usr/local/lib
- /usr/lib64
- /usr/lib
-+ /usr/lib/32
-+ /usr/lib/64
- /sw/lib64
- /sw/lib
- /opt/local/lib64
- /opt/local/lib
-- /opt/csw/lib64
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib64
-+# /opt/csw/lib
- /opt/lib64
- /opt/lib
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
-@@ -112,16 +118,20 @@
- $ENV{OSGDIR}/lib
- $ENV{OSGDIR}
- PATHS
-- /usr/local/lib64
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib64
-+# /usr/local/lib
- /usr/lib64
- /usr/lib
-+ /usr/lib/32
-+ /usr/lib/64
- /sw/lib64
- /sw/lib
- /opt/local/lib64
- /opt/local/lib
-- /opt/csw/lib64
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib64
-+# /opt/csw/lib
- /opt/lib64
- /opt/lib
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
-diff -ru cmake-2.6.2.org//Modules/FindPHP4.cmake cmake-2.6.2/Modules/FindPHP4.cmake
---- cmake-2.6.2.org//Modules/FindPHP4.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindPHP4.cmake Thu May 21 16:21:07 2009
-@@ -9,10 +9,12 @@
-
- SET(PHP4_POSSIBLE_INCLUDE_PATHS
- /usr/include/php4
-- /usr/local/include/php4
-+ /usr/php4/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/php4
- /usr/include/php
-- /usr/local/include/php
-- /usr/local/apache/php
-+# /usr/local/include/php
-+# /usr/local/apache/php
- )
-
- SET(PHP4_POSSIBLE_LIB_PATHS
-diff -ru cmake-2.6.2.org//Modules/FindPNG.cmake cmake-2.6.2/Modules/FindPNG.cmake
---- cmake-2.6.2.org//Modules/FindPNG.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindPNG.cmake Thu May 21 16:21:07 2009
-@@ -13,7 +13,9 @@
-
- IF(ZLIB_FOUND)
- FIND_PATH(PNG_PNG_INCLUDE_DIR png.h
-- /usr/local/include/libpng # OpenBSD
-+ /usr/include/libpng
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/libpng # OpenBSD
- )
-
- SET(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
-diff -ru cmake-2.6.2.org//Modules/FindPhysFS.cmake cmake-2.6.2/Modules/FindPhysFS.cmake
---- cmake-2.6.2.org//Modules/FindPhysFS.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindPhysFS.cmake Thu May 21 16:21:07 2009
-@@ -17,11 +17,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- )
-
-@@ -29,15 +31,17 @@
- NAMES physfs
- HINTS
- $ENV{PHYSFSDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindPike.cmake cmake-2.6.2/Modules/FindPike.cmake
---- cmake-2.6.2.org//Modules/FindPike.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindPike.cmake Thu May 21 16:21:07 2009
-@@ -9,7 +9,9 @@
-
- FILE(GLOB PIKE_POSSIBLE_INCLUDE_PATHS
- /usr/include/pike/*
-- /usr/local/include/pike/*)
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/pike/*
-+ )
-
- FIND_PATH(PIKE_INCLUDE_PATH program.h
- ${PIKE_POSSIBLE_INCLUDE_PATHS})
-diff -ru cmake-2.6.2.org//Modules/FindProducer.cmake cmake-2.6.2/Modules/FindProducer.cmake
---- cmake-2.6.2.org//Modules/FindProducer.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindProducer.cmake Thu May 21 16:21:07 2009
-@@ -38,11 +38,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/include
- /sw/include # Fink
- /opt/local/include # DarwinPorts
-- /opt/csw/include # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/include # Blastwave
- /opt/include
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-@@ -54,13 +56,15 @@
- $ENV{PRODUCER_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindQt.cmake cmake-2.6.2/Modules/FindQt.cmake
---- cmake-2.6.2.org//Modules/FindQt.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindQt.cmake Thu May 21 16:21:07 2009
-@@ -70,8 +70,9 @@
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt"
- ${qt_headers}/Qt
- $ENV{QTDIR}/include/Qt
-- /usr/local/qt/include/Qt
-- /usr/local/include/Qt
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/qt/include/Qt
-+# /usr/local/include/Qt
- /usr/lib/qt/include/Qt
- /usr/include/Qt
- /usr/share/qt4/include/Qt
-@@ -89,8 +90,9 @@
- C:/Qt/3.3.3Educational/include
- $ENV{QTDIR}/include
- /usr/include/qt3/Qt
-- /usr/local/qt/include
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/qt/include
-+# /usr/local/include
- /usr/lib/qt/include
- /usr/include
- /usr/share/qt3/include
-diff -ru cmake-2.6.2.org//Modules/FindQt3.cmake cmake-2.6.2/Modules/FindQt3.cmake
---- cmake-2.6.2.org//Modules/FindQt3.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindQt3.cmake Thu May 21 16:21:07 2009
-@@ -40,7 +40,8 @@
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
- $ENV{QTDIR}/include
- ${GLOB_PATHS_BIN}
-- /usr/local/qt/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/qt/include
- /usr/lib/qt/include
- /usr/lib/qt3/include
- /usr/include/qt
-@@ -78,7 +79,8 @@
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
- $ENV{QTDIR}/lib
- ${GLOB_PATHS_LIB}
-- /usr/local/qt/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/qt/lib
- /usr/lib/qt/lib
- /usr/lib/qt3/lib
- /usr/lib/qt3/lib64
-@@ -98,7 +100,8 @@
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
- $ENV{QTDIR}/lib
- ${GLOB_PATHS_LIB}
-- /usr/local/qt/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/qt/lib
- /usr/lib/qt/lib
- /usr/lib/qt3/lib
- /usr/lib/qt3/lib64
-@@ -116,7 +119,8 @@
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
- $ENV{QTDIR}/lib
- ${GLOB_PATHS_LIB}
-- /usr/local/qt/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/qt/lib
- /usr/lib/qt3/lib
- /usr/lib/qt3/lib64
- /usr/share/qt3/lib
-@@ -134,7 +138,8 @@
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
- $ENV{QTDIR}/bin
- ${GLOB_PATHS_BIN}
-- /usr/local/qt/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/qt/bin
- /usr/lib/qt/bin
- /usr/lib/qt3/bin
- /usr/share/qt3/bin
-@@ -155,7 +160,8 @@
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
- ${GLOB_PATHS_BIN}
-- /usr/local/qt/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/qt/bin
- /usr/lib/qt/bin
- /usr/lib/qt3/bin
- /usr/share/qt3/bin
-diff -ru cmake-2.6.2.org//Modules/FindSDL.cmake cmake-2.6.2/Modules/FindSDL.cmake
---- cmake-2.6.2.org//Modules/FindSDL.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindSDL.cmake Thu May 21 16:21:07 2009
-@@ -59,20 +59,23 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local/include/SDL
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/SDL
- /usr/include/SDL
-- /usr/local/include/SDL12
-- /usr/local/include/SDL11 # FreeBSD ports
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/SDL12
-+# /usr/local/include/SDL11 # FreeBSD ports
- /usr/include/SDL12
- /usr/include/SDL11
-- /usr/local/include
-+# /usr/local/include
- /usr/include
- /sw/include/SDL # Fink
- /sw/include
- /opt/local/include/SDL # DarwinPorts
- /opt/local/include
-- /opt/csw/include/SDL # Blastwave
-- /opt/csw/include
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/include/SDL # Blastwave
-+# /opt/csw/include
- /opt/include/SDL
- /opt/include
- )
-@@ -86,11 +89,13 @@
- $ENV{SDLDIR}
- PATH_SUFFIXES lib64 lib
- PATHS
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-@@ -108,11 +113,13 @@
- $ENV{SDLDIR}
- PATH_SUFFIXES lib64 lib
- PATHS
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
- ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
-diff -ru cmake-2.6.2.org//Modules/FindSDL_image.cmake cmake-2.6.2/Modules/FindSDL_image.cmake
---- cmake-2.6.2.org//Modules/FindSDL_image.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindSDL_image.cmake Thu May 21 16:21:07 2009
-@@ -20,20 +20,24 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local/include/SDL
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/SDL
- /usr/include/SDL
-- /usr/local/include/SDL12
-- /usr/local/include/SDL11 # FreeBSD ports
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/SDL12
-+# /usr/local/include/SDL11 # FreeBSD ports
- /usr/include/SDL12
- /usr/include/SDL11
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/include
- /sw/include/SDL # Fink
- /sw/include
- /opt/local/include/SDL # DarwinPorts
- /opt/local/include
-- /opt/csw/include/SDL # Blastwave
-- /opt/csw/include
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/include/SDL # Blastwave
-+# /opt/csw/include
- /opt/include/SDL
- /opt/include
- )
-@@ -47,11 +51,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindSDL_mixer.cmake cmake-2.6.2/Modules/FindSDL_mixer.cmake
---- cmake-2.6.2.org//Modules/FindSDL_mixer.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindSDL_mixer.cmake Thu May 21 16:21:07 2009
-@@ -20,20 +20,24 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local/include/SDL
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/SDL
- /usr/include/SDL
-- /usr/local/include/SDL12
-- /usr/local/include/SDL11 # FreeBSD ports
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/SDL12
-+# /usr/local/include/SDL11 # FreeBSD ports
- /usr/include/SDL12
- /usr/include/SDL11
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/include
- /sw/include/SDL # Fink
- /sw/include
- /opt/local/include/SDL # DarwinPorts
- /opt/local/include
-- /opt/csw/include/SDL # Blastwave
-- /opt/csw/include
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/include/SDL # Blastwave
-+# /opt/csw/include
- /opt/include/SDL
- /opt/include
- )
-@@ -43,15 +47,17 @@
- HINTS
- $ENV{SDLMIXERDIR}
- $ENV{SDLDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindSDL_net.cmake cmake-2.6.2/Modules/FindSDL_net.cmake
---- cmake-2.6.2.org//Modules/FindSDL_net.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindSDL_net.cmake Thu May 21 16:21:07 2009
-@@ -21,20 +21,22 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local/include/SDL
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/SDL
- /usr/include/SDL
-- /usr/local/include/SDL12
-- /usr/local/include/SDL11 # FreeBSD ports
-+# /usr/local/include/SDL12
-+# /usr/local/include/SDL11 # FreeBSD ports
- /usr/include/SDL12
- /usr/include/SDL11
-- /usr/local/include
-+# /usr/local/include
- /usr/include
- /sw/include/SDL # Fink
- /sw/include
- /opt/local/include/SDL # DarwinPorts
- /opt/local/include
-- /opt/csw/include/SDL # Blastwave
-- /opt/csw/include
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/include/SDL # Blastwave
-+# /opt/csw/include
- /opt/include/SDL
- /opt/include
- )
-@@ -43,15 +45,17 @@
- HINTS
- $ENV{SDLNETDIR}
- $ENV{SDLDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindSDL_sound.cmake cmake-2.6.2/Modules/FindSDL_sound.cmake
---- cmake-2.6.2.org//Modules/FindSDL_sound.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindSDL_sound.cmake Thu May 21 16:21:07 2009
-@@ -68,20 +68,22 @@
- $ENV{SDLDIR}/include
- $ENV{SDLDIR}
- PATHS
-- /usr/local/include/SDL
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/SDL
- /usr/include/SDL
-- /usr/local/include/SDL12
-- /usr/local/include/SDL11 # FreeBSD ports
-+# /usr/local/include/SDL12
-+# /usr/local/include/SDL11 # FreeBSD ports
- /usr/include/SDL12
- /usr/include/SDL11
-- /usr/local/include
-+# /usr/local/include
- /usr/include
- /sw/include/SDL # Fink
- /sw/include
- /opt/local/include/SDL # DarwinPorts
- /opt/local/include
-- /opt/csw/include/SDL # Blastwave
-- /opt/csw/include
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/include/SDL # Blastwave
-+# /opt/csw/include
- /opt/include/SDL
- /opt/include
- )
-@@ -94,11 +96,13 @@
- $ENV{SDLDIR}/lib
- $ENV{SDLDIR}
- PATHS
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib
- /opt/lib
- )
-
-@@ -211,11 +215,13 @@
- $ENV{SDLSOUNDDIR}
- $ENV{SDLDIR}/lib
- $ENV{SDLDIR}
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib
- /opt/lib
- )
- IF(MIKMOD_LIBRARY)
-@@ -234,11 +240,13 @@
- $ENV{SDLSOUNDDIR}
- $ENV{SDLDIR}/lib
- $ENV{SDLDIR}
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib
- /opt/lib
- )
- IF(MODPLUG_LIBRARY)
-@@ -260,11 +268,13 @@
- $ENV{SDLSOUNDDIR}
- $ENV{SDLDIR}/lib
- $ENV{SDLDIR}
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib
- /opt/lib
- )
- IF(VORBIS_LIBRARY)
-@@ -282,11 +292,13 @@
- $ENV{SDLSOUNDDIR}
- $ENV{SDLDIR}/lib
- $ENV{SDLDIR}
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib
- /opt/lib
- )
- IF(OGG_LIBRARY)
-@@ -306,11 +318,13 @@
- $ENV{SDLSOUNDDIR}
- $ENV{SDLDIR}/lib
- $ENV{SDLDIR}
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib
- /opt/lib
- )
- IF(SMPEG_LIBRARY)
-@@ -330,11 +344,13 @@
- $ENV{SDLSOUNDDIR}
- $ENV{SDLDIR}/lib
- $ENV{SDLDIR}
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib
- /opt/lib
- )
- IF(FLAC_LIBRARY)
-@@ -357,11 +373,13 @@
- $ENV{SDLSOUNDDIR}
- $ENV{SDLDIR}/lib
- $ENV{SDLDIR}
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib
- /opt/lib
- )
- IF(SPEEX_LIBRARY)
-@@ -384,11 +402,13 @@
- $ENV{SDLSOUNDDIR}
- $ENV{SDLDIR}/lib
- $ENV{SDLDIR}
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
-- /opt/csw/lib
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/lib
- /opt/lib
- )
- IF(OGG_LIBRARY)
-diff -ru cmake-2.6.2.org//Modules/FindSDL_ttf.cmake cmake-2.6.2/Modules/FindSDL_ttf.cmake
---- cmake-2.6.2.org//Modules/FindSDL_ttf.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindSDL_ttf.cmake Thu May 21 16:21:07 2009
-@@ -20,20 +20,22 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local/include/SDL
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include/SDL
- /usr/include/SDL
-- /usr/local/include/SDL12
-- /usr/local/include/SDL11 # FreeBSD ports
-+# /usr/local/include/SDL12
-+# /usr/local/include/SDL11 # FreeBSD ports
- /usr/include/SDL12
- /usr/include/SDL11
-- /usr/local/include
-+# /usr/local/include
- /usr/include
- /sw/include/SDL # Fink
- /sw/include
- /opt/local/include/SDL # DarwinPorts
- /opt/local/include
-- /opt/csw/include/SDL # Blastwave
-- /opt/csw/include
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw/include/SDL # Blastwave
-+# /opt/csw/include
- /opt/include/SDL
- /opt/include
- )
-@@ -46,11 +48,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- PATH_SUFFIXES lib64 lib
- )
-diff -ru cmake-2.6.2.org//Modules/FindSelfPackers.cmake cmake-2.6.2/Modules/FindSelfPackers.cmake
---- cmake-2.6.2.org//Modules/FindSelfPackers.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindSelfPackers.cmake Thu May 21 16:21:07 2009
-@@ -12,7 +12,8 @@
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
-- /usr/local/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
- /sbin
- )
-
-@@ -21,7 +22,8 @@
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
-- /usr/local/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
- /sbin
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindTCL.cmake cmake-2.6.2/Modules/FindTCL.cmake
---- cmake-2.6.2.org//Modules/FindTCL.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindTCL.cmake Thu May 21 16:21:07 2009
-@@ -66,7 +66,8 @@
- "${TCL_TCLSH_PATH_PARENT}/lib"
- "${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- )
-
- IF(WIN32)
-@@ -146,7 +147,8 @@
- "${TCL_TCLSH_PATH_PARENT}/include"
- "${TK_WISH_PATH_PARENT}/include"
- /usr/include
-- /usr/local/include
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/include
- /usr/include/tcl${TK_LIBRARY_VERSION}
- /usr/include/tcl${TCL_LIBRARY_VERSION}
- /usr/include/tcl8.6
-diff -ru cmake-2.6.2.org//Modules/FindTclStub.cmake cmake-2.6.2/Modules/FindTclStub.cmake
---- cmake-2.6.2.org//Modules/FindTclStub.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindTclStub.cmake Thu May 21 16:21:07 2009
-@@ -53,7 +53,8 @@
- "${TCL_TCLSH_PATH_PARENT}/lib"
- "${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
-- /usr/local/lib
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib
- )
-
- IF(WIN32)
-diff -ru cmake-2.6.2.org//Modules/FindUnixCommands.cmake cmake-2.6.2/Modules/FindUnixCommands.cmake
---- cmake-2.6.2.org//Modules/FindUnixCommands.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindUnixCommands.cmake Thu May 21 16:21:07 2009
-@@ -9,7 +9,8 @@
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
-- /usr/local/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
- /sbin
- )
- MARK_AS_ADVANCED(
-@@ -21,7 +22,8 @@
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
-- /usr/local/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
- /sbin
- )
- MARK_AS_ADVANCED(
-@@ -33,7 +35,8 @@
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
-- /usr/local/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
- /sbin
- )
- MARK_AS_ADVANCED(
-@@ -45,7 +48,8 @@
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
-- /usr/local/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
- /sbin
- )
- MARK_AS_ADVANCED(
-@@ -57,7 +61,8 @@
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
-- /usr/local/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
- /sbin
- )
- MARK_AS_ADVANCED(
-@@ -72,7 +77,8 @@
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
-- /usr/local/bin
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/bin
- /sbin
- )
- MARK_AS_ADVANCED(
-diff -ru cmake-2.6.2.org//Modules/FindVTK.cmake cmake-2.6.2/Modules/FindVTK.cmake
---- cmake-2.6.2.org//Modules/FindVTK.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindVTK.cmake Thu May 21 16:21:07 2009
-@@ -77,7 +77,8 @@
- ${VTK_DIR_SEARCH}
-
- # Look in standard UNIX install locations.
-- /usr/local/lib/vtk
-+# Uncomment the following to enable /usr/local search
-+# /usr/local/lib/vtk
- /usr/lib/vtk
-
- # Read from the CMakeSetup registry entries. It is likely that
-diff -ru cmake-2.6.2.org//Modules/Findosg.cmake cmake-2.6.2/Modules/Findosg.cmake
---- cmake-2.6.2.org//Modules/Findosg.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/Findosg.cmake Thu May 21 16:21:07 2009
-@@ -34,11 +34,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -49,15 +51,17 @@
- HINTS
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgDB.cmake cmake-2.6.2/Modules/FindosgDB.cmake
---- cmake-2.6.2.org//Modules/FindosgDB.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgDB.cmake Thu May 21 16:21:07 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGDB_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgFX.cmake cmake-2.6.2/Modules/FindosgFX.cmake
---- cmake-2.6.2.org//Modules/FindosgFX.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgFX.cmake Thu May 21 16:21:07 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGFX_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgGA.cmake cmake-2.6.2/Modules/FindosgGA.cmake
---- cmake-2.6.2.org//Modules/FindosgGA.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgGA.cmake Thu May 21 16:21:07 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGGA_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgIntrospection.cmake cmake-2.6.2/Modules/FindosgIntrospection.cmake
---- cmake-2.6.2.org//Modules/FindosgIntrospection.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgIntrospection.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGINTROSPECTION_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgManipulator.cmake cmake-2.6.2/Modules/FindosgManipulator.cmake
---- cmake-2.6.2.org//Modules/FindosgManipulator.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgManipulator.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGMANIPULATOR_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgParticle.cmake cmake-2.6.2/Modules/FindosgParticle.cmake
---- cmake-2.6.2.org//Modules/FindosgParticle.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgParticle.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGPARTICLE_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgProducer.cmake cmake-2.6.2/Modules/FindosgProducer.cmake
---- cmake-2.6.2.org//Modules/FindosgProducer.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgProducer.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGPRODUCER_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgShadow.cmake cmake-2.6.2/Modules/FindosgShadow.cmake
---- cmake-2.6.2.org//Modules/FindosgShadow.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgShadow.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGSHADOW_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgSim.cmake cmake-2.6.2/Modules/FindosgSim.cmake
---- cmake-2.6.2.org//Modules/FindosgSim.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgSim.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGSIM_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgTerrain.cmake cmake-2.6.2/Modules/FindosgTerrain.cmake
---- cmake-2.6.2.org//Modules/FindosgTerrain.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgTerrain.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGTERRAIN_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgText.cmake cmake-2.6.2/Modules/FindosgText.cmake
---- cmake-2.6.2.org//Modules/FindosgText.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgText.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGTEXT_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgUtil.cmake cmake-2.6.2/Modules/FindosgUtil.cmake
---- cmake-2.6.2.org//Modules/FindosgUtil.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgUtil.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGUTIL_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/FindosgViewer.cmake cmake-2.6.2/Modules/FindosgViewer.cmake
---- cmake-2.6.2.org//Modules/FindosgViewer.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/FindosgViewer.cmake Thu May 21 16:21:08 2009
-@@ -35,11 +35,13 @@
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-@@ -51,15 +53,17 @@
- $ENV{OSGVIEWER_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
-- PATH_SUFFIXES lib64 lib
-+ PATH_SUFFIXES lib64 lib lib/32 lib/64
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
-- /usr/local
-+# Uncomment the following to enable /usr/local search
-+# /usr/local
- /usr
- /sw
- /opt/local
-- /opt/csw
-+# Uncomment the following to enable /opt/csw search
-+# /opt/csw
- /opt
- )
-
-diff -ru cmake-2.6.2.org//Modules/GetPrerequisites.cmake cmake-2.6.2/Modules/GetPrerequisites.cmake
---- cmake-2.6.2.org//Modules/GetPrerequisites.cmake Wed Sep 24 11:34:34 2008
-+++ cmake-2.6.2/Modules/GetPrerequisites.cmake Thu May 21 16:21:08 2009
-@@ -440,7 +440,8 @@
- "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN"
- "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN"
- "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN"
-- "/usr/local/bin"
-+# Uncomment the following to enable /usr/local search
-+# "/usr/local/bin"
- "/usr/bin"
- )
-
-diff -ru cmake-2.6.2.org//Source/cmDocumentation.cxx cmake-2.6.2/Source/cmDocumentation.cxx
---- cmake-2.6.2.org//Source/cmDocumentation.cxx Wed Apr 15 20:35:21 2009
-+++ cmake-2.6.2/Source/cmDocumentation.cxx Thu May 21 16:14:19 2009
-@@ -1222,6 +1222,7 @@
- bool cmDocumentation::PrintDocumentationUsage(std::ostream& os)
- {
- this->ClearSections();
-+ this->AddSectionToPrint("Name");
- this->AddSectionToPrint("Usage");
- this->AddSectionToPrint("Options");
- this->AddSectionToPrint("Generators");
-@@ -1244,6 +1245,7 @@
- {
- this->ClearSections();
- this->CreateModulesSection();
-+ this->AddSectionToPrint("Name");
- this->AddSectionToPrint("Description");
- this->AddSectionToPrint("Modules");
- this->AddSectionToPrint("Copyright");
-@@ -1259,6 +1261,7 @@
- {
- this->ClearSections();
- this->CreateCustomModulesSection();
-+ this->AddSectionToPrint("Name");
- this->AddSectionToPrint("Description");
- this->AddSectionToPrint("Custom CMake Modules");
- // the custom modules are most probably not under Kitware's copyright, Alex
-@@ -1275,6 +1278,7 @@
- bool cmDocumentation::PrintDocumentationPolicies(std::ostream& os)
- {
- this->ClearSections();
-+ this->AddSectionToPrint("Name");
- this->AddSectionToPrint("Description");
- this->AddSectionToPrint("Policies");
- this->AddSectionToPrint("Copyright");
-@@ -1290,6 +1294,7 @@
- bool cmDocumentation::PrintDocumentationProperties(std::ostream& os)
- {
- this->ClearSections();
-+ this->AddSectionToPrint("Name");
- this->AddSectionToPrint("Properties Description");
- for (std::vector<std::string>::iterator i =
- this->PropertySections.begin();
-@@ -1309,6 +1314,7 @@
- bool cmDocumentation::PrintDocumentationVariables(std::ostream& os)
- {
- this->ClearSections();
-+ this->AddSectionToPrint("Name");
- for (std::vector<std::string>::iterator i =
- this->VariableSections.begin();
- i != this->VariableSections.end(); ++i)
-@@ -1327,6 +1333,7 @@
- bool cmDocumentation::PrintDocumentationCurrentCommands(std::ostream& os)
- {
- this->ClearSections();
-+ this->AddSectionToPrint("Name");
- this->AddSectionToPrint("Commands");
- this->AddSectionToPrint("Copyright");
- this->AddSectionToPrint("Standard See Also");
-@@ -1340,6 +1347,7 @@
- bool cmDocumentation::PrintDocumentationCompatCommands(std::ostream& os)
- {
- this->ClearSections();
-+ this->AddSectionToPrint("Name");
- this->AddSectionToPrint("Compatibility Commands Description");
- this->AddSectionToPrint("Compatibility Commands");
- this->AddSectionToPrint("Copyright");
-diff -ru cmake-2.6.2.org//Source/cmGlobalGenerator.cxx cmake-2.6.2/Source/cmGlobalGenerator.cxx