Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094

Resolved a few conflicts due to changes made in 13094 to paths
Conflicts:
	Modules/FindOpenThreads.cmake
	Modules/Findosg_functions.cmake

Modules/FindCUDA.cmake

@@ -650,9 +650,11 @@ endif()
 # Look for the SDK stuff.  As of CUDA 3.0 NVSDKCUDA_ROOT has been replaced with
 # NVSDKCOMPUTE_ROOT with the old CUDA C contents moved into the C subdirectory
 find_path(CUDA_SDK_ROOT_DIR common/inc/cutil.h
+ HINTS
   "$ENV{NVSDKCOMPUTE_ROOT}/C"
-  "$ENV{NVSDKCUDA_ROOT}"
+  ENV NVSDKCUDA_ROOT
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Installed Products\\NVIDIA SDK 10\\Compute;InstallDir]"
+ PATHS
   "/Developer/GPU\ Computing/C"
   )
 

Modules/FindDart.cmake

@@ -17,14 +17,18 @@
 #  License text for the above reference.)
 
 find_path(DART_ROOT README.INSTALL
-    $ENV{DART_ROOT}
-    ${PROJECT_SOURCE_DIR}/Dart
-     /usr/share/Dart
-    C:/Dart
-    "$ENV{ProgramFiles}/Dart"
-    "C:/Program Files/Dart"
-    ${PROJECT_SOURCE_DIR}/../Dart
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Dart\\InstallPath]
+    HINTS
+      ENV DART_ROOT
+    PATHS
+      ${PROJECT_SOURCE_DIR}
+      /usr/share
+      C:/
+      "C:/Program Files"
+      ${PROJECT_SOURCE_DIR}/..
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Dart\\InstallPath]
+      ENV ProgramFiles
+    PATH_SUFFIXES
+      Dart
     DOC "If you have Dart installed, where is it located?"
     )
 

Modules/FindFLTK.cmake

@@ -93,11 +93,13 @@ if(NOT FLTK_DIR)
   #
   find_path(FLTK_DIR FLTKConfig.cmake
     # Look for an environment variable FLTK_DIR.
-    $ENV{FLTK_DIR}
+    HINTS
+      ENV FLTK_DIR
 
     # Look in places relative to the system executable search path.
     ${FLTK_DIR_SEARCH}
 
+    PATHS
     # Look in standard UNIX install locations.
     /usr/local/lib/fltk
     /usr/lib/fltk

Modules/FindFLTK2.cmake

@@ -73,7 +73,7 @@ if(NOT FLTK2_DIR)
   #
   find_path(FLTK2_DIR FLTK2Config.cmake
     # Look for an environment variable FLTK2_DIR.
-    $ENV{FLTK2_DIR}
+    ENV FLTK2_DIR
 
     # Look in places relative to the system executable search path.
     ${FLTK2_DIR_SEARCH}

Modules/FindFreetype.cmake

@@ -44,7 +44,7 @@
 # everything still works.
 find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
   HINTS
-  $ENV{FREETYPE_DIR}
+    ENV FREETYPE_DIR
   PATHS
   /usr/local/X11R6/include
   /usr/local/X11/include
@@ -53,19 +53,19 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
 
 find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
   HINTS
-  $ENV{FREETYPE_DIR}/include/freetype2
+    ENV FREETYPE_DIR
   PATHS
-  /usr/local/X11R6/include
-  /usr/local/X11/include
-  /usr/freeware/include
-  PATH_SUFFIXES freetype2
+    /usr/local/X11R6
+    /usr/local/X11
+    /usr/freeware
+  PATH_SUFFIXES include/freetype2 include
 )
 
 find_library(FREETYPE_LIBRARY
   NAMES freetype libfreetype freetype219
   HINTS
-  $ENV{FREETYPE_DIR}
-  PATH_SUFFIXES lib64 lib
+    ENV FREETYPE_DIR
+  PATH_SUFFIXES lib
   PATHS
   /usr/local/X11R6
   /usr/local/X11

Modules/FindGDAL.cmake

@@ -42,8 +42,8 @@
 
 find_path(GDAL_INCLUDE_DIR gdal.h
   HINTS
-    $ENV{GDAL_DIR}
-    $ENV{GDAL_ROOT}
+    ENV GDAL_DIR
+    ENV GDAL_ROOT
   PATH_SUFFIXES
      include/gdal
      include/GDAL
@@ -64,8 +64,8 @@ if(UNIX)
     # libgdal.so...
     find_program(GDAL_CONFIG gdal-config
         HINTS
-          $ENV{GDAL_DIR}
-          $ENV{GDAL_ROOT}
+          ENV GDAL_DIR
+          ENV GDAL_ROOT
         PATH_SUFFIXES bin
         PATHS
             /sw # Fink
@@ -88,10 +88,10 @@ endif()
 find_library(GDAL_LIBRARY
   NAMES ${_gdal_lib} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
   HINTS
-     $ENV{GDAL_DIR}
-     $ENV{GDAL_ROOT}
+     ENV GDAL_DIR
+     ENV GDAL_ROOT
      ${_gdal_libpath}
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib
   PATHS
     /sw
     /opt/local

Modules/FindGIF.cmake

@@ -28,7 +28,7 @@
 
 find_path(GIF_INCLUDE_DIR gif_lib.h
   HINTS
-  $ENV{GIF_DIR}
+    ENV GIF_DIR
   PATH_SUFFIXES include
   PATHS
   ~/Library/Frameworks
@@ -41,8 +41,8 @@ set(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib giflib4)
 find_library(GIF_LIBRARY
   NAMES ${POTENTIAL_GIF_LIBS}
   HINTS
-  $ENV{GIF_DIR}
-  PATH_SUFFIXES lib64 lib
+    ENV GIF_DIR
+  PATH_SUFFIXES lib
   PATHS
   ~/Library/Frameworks
   /usr/freeware

Modules/FindGTK2.cmake

@@ -172,7 +172,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
         sigc++-2.0
     )
 
-    set(_suffixes)
+    set(_suffixes include lib)
     foreach(_d ${_relatives})
         list(APPEND _suffixes ${_d})
         list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include
@@ -186,23 +186,15 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
     find_path(${_var} ${_hdr}
         PATHS
             /usr/local/lib64
-            /usr/local/lib
             /usr/lib64
-            /usr/lib
-            /opt/gnome/include
-            /opt/gnome/lib
-            /opt/openwin/include
-            /usr/openwin/lib
-            /sw/include
-            /sw/lib
-            /opt/local/include
-            /opt/local/lib
-            $ENV{GTKMM_BASEPATH}/include
-            $ENV{GTKMM_BASEPATH}/lib
-            [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
-            [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
-            [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/include
-            [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+            /opt/gnome
+            /opt/openwin
+            /usr/openwin
+            /sw
+            /opt/local
+            ENV GTKMM_BASEPATH
+            [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+            [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
         PATH_SUFFIXES
             ${_suffixes}
     )

Modules/FindGTest.cmake

@@ -98,7 +98,7 @@ function(_gtest_find_library _name)
     find_library(${_name}
         NAMES ${ARGN}
         HINTS
-            $ENV{GTEST_ROOT}
+            ENV GTEST_ROOT
             ${GTEST_ROOT}
         PATH_SUFFIXES ${_gtest_libpath_suffixes}
     )

Modules/FindLua50.cmake

@@ -26,7 +26,7 @@
 
 find_path(LUA_INCLUDE_DIR lua.h
   HINTS
-  $ENV{LUA_DIR}
+    ENV LUA_DIR
   PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
   PATHS
   ~/Library/Frameworks
@@ -40,8 +40,8 @@ find_path(LUA_INCLUDE_DIR lua.h
 find_library(LUA_LIBRARY_lua
   NAMES lua50 lua5.0 lua-5.0 lua5 lua
   HINTS
-  $ENV{LUA_DIR}
-  PATH_SUFFIXES lib64 lib
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
@@ -59,9 +59,9 @@ else()
   find_library(LUA_LIBRARY_lualib
     NAMES lualib50 lualib5.0 lualib5 lualib
     HINTS
-    $ENV{LUALIB_DIR}
-    $ENV{LUA_DIR}
-    PATH_SUFFIXES lib64 lib
+      ENV LUALIB_DIR
+      ENV LUA_DIR
+    PATH_SUFFIXES lib
     PATHS
     /sw
     /opt/local

Modules/FindLua51.cmake

@@ -27,7 +27,7 @@
 
 find_path(LUA_INCLUDE_DIR lua.h
   HINTS
-  $ENV{LUA_DIR}
+    ENV LUA_DIR
   PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
   PATHS
   ~/Library/Frameworks
@@ -41,8 +41,8 @@ find_path(LUA_INCLUDE_DIR lua.h
 find_library(LUA_LIBRARY
   NAMES lua51 lua5.1 lua-5.1 lua
   HINTS
-  $ENV{LUA_DIR}
-  PATH_SUFFIXES lib64 lib
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks

Modules/FindOpenAL.cmake

@@ -63,7 +63,7 @@
 
 find_path(OPENAL_INCLUDE_DIR al.h
   HINTS
-  $ENV{OPENALDIR}
+    ENV OPENALDIR
   PATH_SUFFIXES include/AL include/OpenAL include
   PATHS
   ~/Library/Frameworks
@@ -78,7 +78,7 @@ find_path(OPENAL_INCLUDE_DIR al.h
 find_library(OPENAL_LIBRARY
   NAMES OpenAL al openal OpenAL32
   HINTS
-  $ENV{OPENALDIR}
+    ENV OPENALDIR
   PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
   PATHS
   ~/Library/Frameworks

Modules/FindOpenThreads.cmake

@@ -58,13 +58,13 @@
 
 find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
     HINTS
-        $ENV{OPENTHREADS_INCLUDE_DIR}
-        $ENV{OPENTHREADS_DIR}
-        $ENV{OSG_INCLUDE_DIR}
-        $ENV{OSG_DIR}
-        $ENV{OSGDIR}
-        $ENV{OpenThreads_ROOT}
-        $ENV{OSG_ROOT}
+        ENV OPENTHREADS_INCLUDE_DIR
+        ENV OPENTHREADS_DIR
+        ENV OSG_INCLUDE_DIR
+        ENV OSG_DIR
+        ENV OSGDIR
+        ENV OpenThreads_ROOT
+        ENV OSG_ROOT
         ${OPENTHREADS_DIR}
         ${OSG_DIR}
     PATHS
@@ -80,13 +80,13 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
 find_library(OPENTHREADS_LIBRARY
     NAMES OpenThreads OpenThreadsWin32
     HINTS
-        $ENV{OPENTHREADS_LIBRARY_DIR}
-        $ENV{OPENTHREADS_DIR}
-        $ENV{OSG_LIBRARY_DIR}
-        $ENV{OSG_DIR}
-        $ENV{OSGDIR}
-        $ENV{OpenThreads_ROOT}
-        $ENV{OSG_ROOT}
+        ENV OPENTHREADS_LIBRARY_DIR
+        ENV OPENTHREADS_DIR
+        ENV OSG_LIBRARY_DIR
+        ENV OSG_DIR
+        ENV OSGDIR
+        ENV OpenThreads_ROOT
+        ENV OSG_ROOT
         ${OPENTHREADS_DIR}
         ${OSG_DIR}
     PATHS
@@ -95,20 +95,20 @@ find_library(OPENTHREADS_LIBRARY
         /opt/csw
         /opt
         /usr/freeware
-    PATH_SUFFIXES lib64 lib
+    PATH_SUFFIXES lib
 )
 
 find_library(OPENTHREADS_LIBRARY_DEBUG
     NAMES OpenThreadsd OpenThreadsWin32d
     HINTS
-        $ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
-        $ENV{OPENTHREADS_LIBRARY_DIR}
-        $ENV{OPENTHREADS_DIR}
-        $ENV{OSG_LIBRARY_DIR}
-        $ENV{OSG_DIR}
-        $ENV{OSGDIR}
-        $ENV{OpenThreads_ROOT}
-        $ENV{OSG_ROOT}
+        ENV OPENTHREADS_DEBUG_LIBRARY_DIR
+        ENV OPENTHREADS_LIBRARY_DIR
+        ENV OPENTHREADS_DIR
+        ENV OSG_LIBRARY_DIR
+        ENV OSG_DIR
+        ENV OSGDIR
+        ENV OpenThreads_ROOT
+        ENV OSG_ROOT
         ${OPENTHREADS_DIR}
         ${OSG_DIR}
     PATHS
@@ -117,7 +117,7 @@ find_library(OPENTHREADS_LIBRARY_DEBUG
         /opt/csw
         /opt
         /usr/freeware
-    PATH_SUFFIXES lib64 lib
+    PATH_SUFFIXES lib
 )
 
 if(OPENTHREADS_LIBRARY_DEBUG)

Modules/FindPhysFS.cmake

@@ -25,7 +25,7 @@
 
 find_path(PHYSFS_INCLUDE_DIR physfs.h
   HINTS
-  $ENV{PHYSFSDIR}
+    ENV PHYSFSDIR
   PATH_SUFFIXES include/physfs include
   PATHS
   ~/Library/Frameworks
@@ -39,8 +39,8 @@ find_path(PHYSFS_INCLUDE_DIR physfs.h
 find_library(PHYSFS_LIBRARY
   NAMES physfs
   HINTS
-  $ENV{PHYSFSDIR}
-  PATH_SUFFIXES lib64 lib
+    ENV PHYSFSDIR
+  PATH_SUFFIXES lib
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks

Modules/FindPostgreSQL.cmake

@@ -74,11 +74,6 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
 set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
 
 
-set(PostgreSQL_ROOT_DIRECTORIES $ENV{PostgreSQL_ROOT})
-if(PostgreSQL_ROOT_DIRECTORIES)
-  file(TO_CMAKE_PATH ${PostgreSQL_ROOT_DIRECTORIES} PostgreSQL_ROOT_DIRECTORIES)
-endif()
-
 set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
     "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
 
@@ -89,7 +84,7 @@ if ( WIN32 )
   endforeach()
 endif()
 set( PostgreSQL_ROOT_DIRECTORIES
-   ${PostgreSQL_ROOT_DIRECTORIES}
+   ENV PostgreSQL_ROOT
    ${PostgreSQL_ROOT}
    ${PostgreSQL_ADDITIONAL_SEARCH_PATHS}
 )

Modules/FindProducer.cmake

@@ -44,9 +44,9 @@
 # Try the user's environment request before anything else.
 find_path(PRODUCER_INCLUDE_DIR Producer/CameraGroup
   HINTS
-  $ENV{PRODUCER_DIR}
-  $ENV{OSG_DIR}
-  $ENV{OSGDIR}
+    ENV PRODUCER_DIR
+    ENV OSG_DIR
+    ENV OSGDIR
   PATH_SUFFIXES include
   PATHS
     ~/Library/Frameworks
@@ -62,10 +62,10 @@ find_path(PRODUCER_INCLUDE_DIR Producer/CameraGroup
 find_library(PRODUCER_LIBRARY
   NAMES Producer
   HINTS
-  $ENV{PRODUCER_DIR}
-  $ENV{OSG_DIR}
-  $ENV{OSGDIR}
-  PATH_SUFFIXES lib64 lib
+    ENV PRODUCER_DIR
+    ENV OSG_DIR
+    ENV OSGDIR
+  PATH_SUFFIXES lib
   PATHS
   /sw
   /opt/local

Modules/FindQt3.cmake

@@ -91,17 +91,18 @@ if (QT_MT_REQUIRED)
     qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
     qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
     PATHS
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
-    $ENV{QTDIR}/lib
-    ${GLOB_PATHS_LIB}
-    /usr/local/qt/lib
-    /usr/lib/qt/lib
-    /usr/lib/qt3/lib
-    /usr/lib/qt3/lib64
-    /usr/share/qt3/lib
-    C:/Progra~1/qt/lib
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]"
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
+      ENV QTDIR
+      ${GLOB_PATHS_LIB}
+      /usr/local/qt
+      /usr/lib/qt
+      /usr/lib/qt3
+      /usr/share/qt3
+      C:/Progra~1/qt
+    PATH_SUFFIXES
+      lib
     )
 
 else ()
@@ -111,17 +112,18 @@ else ()
     qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
     qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
     PATHS
-    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
-    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
-    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
-    $ENV{QTDIR}/lib
-    ${GLOB_PATHS_LIB}
-    /usr/local/qt/lib
-    /usr/lib/qt/lib
-    /usr/lib/qt3/lib
-    /usr/lib/qt3/lib64
-    /usr/share/qt3/lib
-    C:/Progra~1/qt/lib
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]"
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
+      ENV QTDIR
+      ${GLOB_PATHS_LIB}
+      /usr/local/qt
+      /usr/lib/qt
+      /usr/lib/qt3
+      /usr/share/qt3
+      C:/Progra~1/qt/lib
+    PATH_SUFFIXES
+      lib
     )
 endif ()
 
@@ -129,35 +131,37 @@ endif ()
 find_library(QT_QASSISTANTCLIENT_LIBRARY
   NAMES qassistantclient
   PATHS
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
-  $ENV{QTDIR}/lib
-  ${GLOB_PATHS_LIB}
-  /usr/local/qt/lib
-  /usr/lib/qt3/lib
-  /usr/lib/qt3/lib64
-  /usr/share/qt3/lib
-  C:/Progra~1/qt/lib
+    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]"
+    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
+    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
+    ENV QTDIR
+    ${GLOB_PATHS_LIB}
+    /usr/local/qt
+    /usr/lib/qt3
+    /usr/share/qt3
+    C:/Progra~1/qt
+  PATH_SUFFIXES
+    lib
   )
 
 # qt 3 should prefer QTDIR over the PATH
 find_program(QT_MOC_EXECUTABLE
   NAMES moc-qt3 moc
   HINTS
-  $ENV{QTDIR}/bin
+    ENV QTDIR
   PATHS
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
-  $ENV{QTDIR}/bin
   ${GLOB_PATHS_BIN}
-  /usr/local/qt/bin
-  /usr/lib/qt/bin
-  /usr/lib/qt3/bin
-  /usr/share/qt3/bin
-  C:/Progra~1/qt/bin
-  /usr/X11R6/bin
+    /usr/local/qt
+    /usr/lib/qt
+    /usr/lib/qt3
+    /usr/share/qt3
+    C:/Progra~1/qt
+    /usr/X11R6
+  PATH_SUFFIXES
+    bin
   )
 
 if(QT_MOC_EXECUTABLE)
@@ -168,18 +172,20 @@ endif()
 find_program(QT_UIC_EXECUTABLE
   NAMES uic-qt3 uic
   HINTS
-  $ENV{QTDIR}/bin
+    ENV QTDIR
   PATHS
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
   "[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
-  /usr/lib/qt/bin
-  /usr/lib/qt3/bin
-  /usr/share/qt3/bin
-  C:/Progra~1/qt/bin
-  /usr/X11R6/bin
+    /usr/local/qt
+    /usr/lib/qt
+    /usr/lib/qt3
+    /usr/share/qt3
+    C:/Progra~1/qt
+    /usr/X11R6
+  PATH_SUFFIXES
+    bin
   )
 
 if(QT_UIC_EXECUTABLE)
@@ -189,13 +195,15 @@ endif()
 if (WIN32)
   find_library(QT_QTMAIN_LIBRARY qtmain
     HINTS
-    $ENV{QTDIR}/lib
-    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
-    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
-    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
+      ENV QTDIR
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]"
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
     PATHS
-    "$ENV{ProgramFiles}/qt/lib"
-    "C:/Program Files/qt/lib"
+      "$ENV{ProgramFiles}/qt"
+      "C:/Program Files/qt"
+    PATH_SUFFIXES
+      lib
     DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise."
     )
 endif ()

Modules/FindQuickTime.cmake

@@ -22,24 +22,18 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-# QuickTime on OS X looks different than QuickTime for Windows,
-# so I am going to case the two.
-
-if(APPLE)
-  find_path(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h)
-  find_library(QUICKTIME_LIBRARY QuickTime)
-else()
-  find_path(QUICKTIME_INCLUDE_DIR QuickTime.h
-    HINTS
-    $ENV{QUICKTIME_DIR}/include
-    $ENV{QUICKTIME_DIR}
-  )
-  find_library(QUICKTIME_LIBRARY QuickTime
-    HINTS
-    $ENV{QUICKTIME_DIR}/lib
-    $ENV{QUICKTIME_DIR}
-  )
-endif()
+find_path(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h QuickTime.h
+  HINTS
+    ENV QUICKTIME_DIR
+  PATH_SUFFIXES
+    include
+)
+find_library(QUICKTIME_LIBRARY QuickTime
+  HINTS
+    ENV QUICKTIME_DIR
+  PATH_SUFFIXES
+    lib
+)
 
 # handle the QUIETLY and REQUIRED arguments and set QUICKTIME_FOUND to TRUE if
 # all listed variables are TRUE

Modules/FindRTI.cmake

@@ -35,18 +35,13 @@ macro(RTI_MESSAGE_QUIETLY QUIET TYPE MSG)
   endif()
 endmacro()
 
-# Detect the CERTI installation, http://www.cert.fr/CERTI
-if ("$ENV{CERTI_HOME}" STRGREATER "")
-  file(TO_CMAKE_PATH "$ENV{CERTI_HOME}" CERTI_HOME)
-  RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "Using environment defined CERTI_HOME: ${CERTI_HOME}")
-endif ()
-
 set(RTI_DEFINITIONS "-DRTI_USES_STD_FSTREAM")
 
+# Detect the CERTI installation, http://www.cert.fr/CERTI
 # Detect the MAK Technologies RTI installation, http://www.mak.com/products/rti.php
 # note: the following list is ordered to find the most recent version first
 set(RTI_POSSIBLE_DIRS
-  ${CERTI_HOME}
+  ENV CERTI_HOME
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 3.2 MSVC++ 8.0;Location]"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK RTI 3.2-win32-msvc++8.0;InstallLocation]"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 2.2;Location]"

Modules/FindSDL.cmake

@@ -67,7 +67,7 @@
 
 find_path(SDL_INCLUDE_DIR SDL.h
   HINTS
-  $ENV{SDLDIR}
+    ENV SDLDIR
   PATH_SUFFIXES include/SDL include
   PATHS
   ~/Library/Frameworks
@@ -87,8 +87,8 @@ find_path(SDL_INCLUDE_DIR SDL.h
 find_library(SDL_LIBRARY_TEMP
   NAMES SDL SDL-1.1
   HINTS
-  $ENV{SDLDIR}
-  PATH_SUFFIXES lib64 lib
+    ENV SDLDIR
+  PATH_SUFFIXES lib
   PATHS
   /sw
   /opt/local
@@ -105,8 +105,8 @@ if(NOT SDL_BUILDING_LIBRARY)
     find_library(SDLMAIN_LIBRARY
       NAMES SDLmain SDLmain-1.1
       HINTS
-      $ENV{SDLDIR}
-      PATH_SUFFIXES lib64 lib
+        ENV SDLDIR
+      PATH_SUFFIXES lib
       PATHS
       /sw
       /opt/local

Modules/FindSDL_image.cmake

@@ -27,34 +27,28 @@
 
 find_path(SDLIMAGE_INCLUDE_DIR SDL_image.h
   HINTS
-  $ENV{SDLIMAGEDIR}
-  $ENV{SDLDIR}
-  PATH_SUFFIXES include
+    ENV SDLIMAGEDIR
+    ENV SDLDIR
+  PATH_SUFFIXES include include/SDL
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local/include/SDL
-  /usr/include/SDL
   /usr/local/include/SDL12
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include
-  /opt/include/SDL
-  /opt/include
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
 )
 
 find_library(SDLIMAGE_LIBRARY
   NAMES SDL_image
   HINTS
-  $ENV{SDLIMAGEDIR}
-  $ENV{SDLDIR}
-  PATH_SUFFIXES lib64 lib
+    ENV SDLIMAGEDIR
+    ENV SDLDIR
+  PATH_SUFFIXES lib
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks

Modules/FindSDL_mixer.cmake

@@ -27,34 +27,28 @@
 
 find_path(SDLMIXER_INCLUDE_DIR SDL_mixer.h
   HINTS
-  $ENV{SDLMIXERDIR}
-  $ENV{SDLDIR}
-  PATH_SUFFIXES include
+    ENV SDLMIXERDIR
+    ENV SDLDIR
+  PATH_SUFFIXES include include/SDL
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local/include/SDL
-  /usr/include/SDL
   /usr/local/include/SDL12
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include
-  /opt/include/SDL
-  /opt/include
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
 )
 
 find_library(SDLMIXER_LIBRARY
   NAMES SDL_mixer
   HINTS
-  $ENV{SDLMIXERDIR}
-  $ENV{SDLDIR}
-  PATH_SUFFIXES lib64 lib
+    ENV SDLMIXERDIR
+    ENV SDLDIR
+  PATH_SUFFIXES lib
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks

Modules/FindSDL_net.cmake

@@ -27,33 +27,27 @@
 
 find_path(SDLNET_INCLUDE_DIR SDL_net.h
   HINTS
-  $ENV{SDLNETDIR}
-  $ENV{SDLDIR}
-  PATH_SUFFIXES include
+    ENV SDLNETDIR
+    ENV SDLDIR
+  PATH_SUFFIXES include include/SDL
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local/include/SDL
-  /usr/include/SDL
   /usr/local/include/SDL12
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include
-  /opt/include/SDL
-  /opt/include
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
 )
 find_library(SDLNET_LIBRARY
   NAMES SDL_net
   HINTS
-  $ENV{SDLNETDIR}
-  $ENV{SDLDIR}
-  PATH_SUFFIXES lib64 lib
+    ENV SDLNETDIR
+    ENV SDLDIR
+  PATH_SUFFIXES lib
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks

Modules/FindSDL_sound.cmake

@@ -75,39 +75,33 @@ mark_as_advanced(SDL_SOUND_EXTRAS)
 # Find SDL_sound.h
 find_path(SDL_SOUND_INCLUDE_DIR SDL_sound.h
   HINTS
-  $ENV{SDLSOUNDDIR}/include
-  $ENV{SDLSOUNDDIR}
-  $ENV{SDLDIR}/include
-  $ENV{SDLDIR}
+    ENV SDLSOUNDDIR
+    ENV SDLDIR
+  PATH_SUFFIXES
+    include include/SDL
   PATHS
-  /usr/local/include/SDL
-  /usr/include/SDL
   /usr/local/include/SDL12
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include
-  /opt/include/SDL
-  /opt/include
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
   )
 
 find_library(SDL_SOUND_LIBRARY
   NAMES SDL_sound
   HINTS
-  $ENV{SDLSOUNDDIR}/lib
-  $ENV{SDLSOUNDDIR}
-  $ENV{SDLDIR}/lib
-  $ENV{SDLDIR}
+    ENV SDLSOUNDDIR
+    ENV SDLDIR
+  PATH_SUFFIXES
+    lib
   PATHS
-  /sw/lib
-  /opt/local/lib
-  /opt/csw/lib
-  /opt/lib
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
   )
 
 if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
@@ -212,37 +206,35 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
      find_library(MIKMOD_LIBRARY
          NAMES libmikmod-coreaudio mikmod
          PATHS
-         $ENV{MIKMODDIR}/lib
-         $ENV{MIKMODDIR}
-         $ENV{SDLSOUNDDIR}/lib
-         $ENV{SDLSOUNDDIR}
-         $ENV{SDLDIR}/lib
-         $ENV{SDLDIR}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-       /opt/lib
+           ENV MIKMODDIR
+           ENV SDLSOUNDDIR
+           ENV SDLDIR
+           /sw
+           /opt/local
+           /opt/csw
+           /opt
+         PATH_SUFFIXES
+           lib
        )
        if(MIKMOD_LIBRARY)
          set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MIKMOD_LIBRARY})
-       endif()
-     endif()
+       endif(MIKMOD_LIBRARY)
+     endif("${MY_OUTPUT}" MATCHES "MikMod_")
 
      # Find ModPlug
      if("${MY_OUTPUT}" MATCHES "MODPLUG_")
        find_library(MODPLUG_LIBRARY
          NAMES modplug
          PATHS
-         $ENV{MODPLUGDIR}/lib
-         $ENV{MODPLUGDIR}
-         $ENV{SDLSOUNDDIR}/lib
-         $ENV{SDLSOUNDDIR}
-         $ENV{SDLDIR}/lib
-         $ENV{SDLDIR}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-       /opt/lib
+           ENV MODPLUGDIR
+           ENV SDLSOUNDDIR
+           ENV SDLDIR
+           /sw
+           /opt/local
+           /opt/csw
+           /opt
+         PATH_SUFFIXES
+           lib
        )
        if(MODPLUG_LIBRARY)
          set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MODPLUG_LIBRARY})
@@ -255,18 +247,16 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
        find_library(VORBIS_LIBRARY
          NAMES vorbis Vorbis VORBIS
          PATHS
-         $ENV{VORBISDIR}/lib
-         $ENV{VORBISDIR}
-         $ENV{OGGDIR}/lib
-         $ENV{OGGDIR}
-         $ENV{SDLSOUNDDIR}/lib
-         $ENV{SDLSOUNDDIR}
-         $ENV{SDLDIR}/lib
-         $ENV{SDLDIR}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-       /opt/lib
+           ENV VORBISDIR
+           ENV OGGDIR
+           ENV SDLSOUNDDIR
+           ENV SDLDIR
+           /sw
+           /opt/local
+           /opt/csw
+           /opt
+         PATH_SUFFIXES
+           lib
          )
        if(VORBIS_LIBRARY)
          set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${VORBIS_LIBRARY})
@@ -275,18 +265,16 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
        find_library(OGG_LIBRARY
          NAMES ogg Ogg OGG
          PATHS
-         $ENV{OGGDIR}/lib
-         $ENV{OGGDIR}
-         $ENV{VORBISDIR}/lib
-         $ENV{VORBISDIR}
-         $ENV{SDLSOUNDDIR}/lib
-         $ENV{SDLSOUNDDIR}
-         $ENV{SDLDIR}/lib
-         $ENV{SDLDIR}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-       /opt/lib
+           ENV OGGDIR
+           ENV VORBISDIR
+           ENV SDLSOUNDDIR
+           ENV SDLDIR
+           /sw
+           /opt/local
+           /opt/csw
+           /opt
+         PATH_SUFFIXES
+           lib
          )
        if(OGG_LIBRARY)
          set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})
@@ -299,16 +287,15 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
        find_library(SMPEG_LIBRARY
          NAMES smpeg SMPEG Smpeg SMpeg
          PATHS
-         $ENV{SMPEGDIR}/lib
-         $ENV{SMPEGDIR}
-         $ENV{SDLSOUNDDIR}/lib
-         $ENV{SDLSOUNDDIR}
-         $ENV{SDLDIR}/lib
-         $ENV{SDLDIR}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-       /opt/lib
+           ENV SMPEGDIR
+           ENV SDLSOUNDDIR
+           ENV SDLDIR
+           /sw
+           /opt/local
+           /opt/csw
+           /opt
+         PATH_SUFFIXES
+           lib
          )
        if(SMPEG_LIBRARY)
          set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SMPEG_LIBRARY})
@@ -321,16 +308,15 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
        find_library(FLAC_LIBRARY
          NAMES flac FLAC
          PATHS
-         $ENV{FLACDIR}/lib
-         $ENV{FLACDIR}
-         $ENV{SDLSOUNDDIR}/lib
-         $ENV{SDLSOUNDDIR}
-         $ENV{SDLDIR}/lib
-         $ENV{SDLDIR}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-       /opt/lib
+           ENV FLACDIR
+           ENV SDLSOUNDDIR
+           ENV SDLDIR
+           /sw
+           /opt/local
+           /opt/csw
+           /opt
+         PATH_SUFFIXES
+           lib
          )
        if(FLAC_LIBRARY)
          set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${FLAC_LIBRARY})
@@ -346,16 +332,15 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
        find_library(SPEEX_LIBRARY
          NAMES speex SPEEX
          PATHS
-         $ENV{SPEEXDIR}/lib
-         $ENV{SPEEXDIR}
-         $ENV{SDLSOUNDDIR}/lib
-         $ENV{SDLSOUNDDIR}
-         $ENV{SDLDIR}/lib
-         $ENV{SDLDIR}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-       /opt/lib
+           ENV SPEEXDIR
+           ENV SDLSOUNDDIR
+           ENV SDLDIR
+           /sw
+           /opt/local
+           /opt/csw
+           /opt
+         PATH_SUFFIXES
+           lib
          )
        if(SPEEX_LIBRARY)
          set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SPEEX_LIBRARY})
@@ -367,20 +352,16 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
          find_library(OGG_LIBRARY
            NAMES ogg Ogg OGG
            PATHS
-           $ENV{OGGDIR}/lib
-           $ENV{OGGDIR}
-           $ENV{VORBISDIR}/lib
-           $ENV{VORBISDIR}
-           $ENV{SPEEXDIR}/lib
-           $ENV{SPEEXDIR}
-           $ENV{SDLSOUNDDIR}/lib
-           $ENV{SDLSOUNDDIR}
-           $ENV{SDLDIR}/lib
-           $ENV{SDLDIR}
-           /sw/lib
-           /opt/local/lib
-           /opt/csw/lib
-         /opt/lib
+             ENV OGGDIR
+             ENV VORBISDIR
+             ENV SPEEXDIR
+             ENV SDLSOUNDDIR
+             ENV SDLDIR
+             /sw
+             /opt/local
+             /opt/csw
+             /opt
+           PATH_SUFFIXES lib
            )
          if(OGG_LIBRARY)
            set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})

Modules/FindSDL_ttf.cmake

@@ -27,33 +27,27 @@
 
 find_path(SDLTTF_INCLUDE_DIR SDL_ttf.h
   HINTS
-  $ENV{SDLTTFDIR}
-  $ENV{SDLDIR}
-  PATH_SUFFIXES include
+    ENV SDLTTFDIR
+    ENV SDLDIR
+  PATH_SUFFIXES include include/SDL
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local/include/SDL
-  /usr/include/SDL
   /usr/local/include/SDL12
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include
-  /opt/include/SDL
-  /opt/include
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
 )
 
 find_library(SDLTTF_LIBRARY
   NAMES SDL_ttf
   HINTS
-  $ENV{SDLTTFDIR}
-  $ENV{SDLDIR}
+    ENV SDLTTFDIR
+    ENV SDLDIR
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
@@ -61,7 +55,7 @@ find_library(SDLTTF_LIBRARY
   /opt/local
   /opt/csw
   /opt
-    PATH_SUFFIXES lib64 lib
+    PATH_SUFFIXES lib
 )
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)

Modules/FindSquish.cmake

@@ -54,8 +54,9 @@ if(NOT SQUISH_INSTALL_DIR)
 
   # Look for an installation
   find_path(SQUISH_INSTALL_DIR bin/squishrunner
+    HINTS
     # Look for an environment variable SQUISH_INSTALL_DIR.
-    $ENV{SQUISH_INSTALL_DIR}
+      ENV SQUISH_INSTALL_DIR
 
     # Look in places relative to the system executable search path.
     ${SQUISH_INSTALL_DIR_SEARCH}

Modules/FindVTK.cmake

@@ -90,7 +90,7 @@ if(_VTK_40_ALLOW AND NOT VTK_DIR)
   find_path(VTK_DIR
     NAMES UseVTK.cmake
     PATH_SUFFIXES vtk-4.0 vtk
-    HINTS $ENV{VTK_DIR}
+    HINTS ENV VTK_DIR
 
     PATHS
 

Modules/Findosg_functions.cmake

@@ -27,10 +27,10 @@ function(OSG_FIND_PATH module header)
    # Try the user's environment request before anything else.
    find_path(${module_uc}_INCLUDE_DIR ${header}
        HINTS
-            $ENV{${module_uc}_DIR}
-            $ENV{OSG_DIR}
-            $ENV{OSGDIR}
-            $ENV{OSG_ROOT}
+            ENV ${module_uc}_DIR
+            ENV OSG_DIR
+            ENV OSGDIR
+            ENV OSG_ROOT
             ${${module_uc}_DIR}
             ${OSG_DIR}
        PATH_SUFFIXES include
@@ -53,13 +53,13 @@ function(OSG_FIND_LIBRARY module library)
    find_library(${module_uc}_LIBRARY
        NAMES ${library}
        HINTS
-            $ENV{${module_uc}_DIR}
-            $ENV{OSG_DIR}
-            $ENV{OSGDIR}
-            $ENV{OSG_ROOT}
+            ENV ${module_uc}_DIR
+            ENV OSG_DIR
+            ENV OSGDIR
+            ENV OSG_ROOT
             ${${module_uc}_DIR}
             ${OSG_DIR}
-       PATH_SUFFIXES lib64 lib
+       PATH_SUFFIXES lib
        PATHS
             /sw # Fink
             /opt/local # DarwinPorts
@@ -71,13 +71,13 @@ function(OSG_FIND_LIBRARY module library)
    find_library(${module_uc}_LIBRARY_DEBUG
        NAMES ${library}d
        HINTS
-            $ENV{${module_uc}_DIR}
-            $ENV{OSG_DIR}
-            $ENV{OSGDIR}
-            $ENV{OSG_ROOT}
+            ENV ${module_uc}_DIR
+            ENV OSG_DIR
+            ENV OSGDIR
+            ENV OSG_ROOT
             ${${module_uc}_DIR}
             ${OSG_DIR}
-       PATH_SUFFIXES lib64 lib
+       PATH_SUFFIXES lib
        PATHS
             /sw # Fink
             /opt/local # DarwinPorts

Modules/FindwxWidgets.cmake

@@ -421,12 +421,12 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
   find_path(wxWidgets_ROOT_DIR
     NAMES include/wx/wx.h
     PATHS
-      $ENV{wxWidgets_ROOT_DIR}
-      $ENV{WXWIN}
+      ENV wxWidgets_ROOT_DIR
+      ENV WXWIN
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]"  # WX 2.6.x
       C:/
       D:/
-      $ENV{ProgramFiles}
+      ENV ProgramFiles
     PATH_SUFFIXES
       wxWidgets-2.9.4
       wxWidgets-2.9.3

Modules/FindwxWindows.cmake

@@ -106,18 +106,6 @@ if(WIN32_STYLE_FIND)
   ## fix the root dir to avoid mixing of headers/libs from different
   ## versions/builds:
 
-  set (WXWINDOWS_POSSIBLE_ROOT_PATHS
-    $ENV{WXWIN}
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]"  ## WX 2.6.x
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWindows_is1;Inno Setup: App Path]"  ## WX 2.4.x
-    C:\\wxWidgets-2.6.2
-    D:\\wxWidgets-2.6.2
-    C:\\wxWidgets-2.6.1
-    D:\\wxWidgets-2.6.1
-    C:\\wxWindows-2.4.2
-    D:\\wxWindows-2.4.2
-    )
-
   ## WX supports monolithic and multiple smaller libs (since 2.5.x), we prefer monolithic for now.
   ## monolithic = WX is built as a single big library
   ## e.g. compile on WIN32 as  "nmake -f makefile.vc MONOLITHIC=1 BUILD=debug SHARED=0 USE_OPENGL=1" (JW)
@@ -132,7 +120,18 @@ if(WIN32_STYLE_FIND)
   ## avoid mixing of headers and libs between multiple installed WX versions,
   ## select just one tree here:
   find_path(WXWINDOWS_ROOT_DIR  include/wx/wx.h
-    ${WXWINDOWS_POSSIBLE_ROOT_PATHS} )
+    HINTS
+      ENV WXWIN
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]"  ## WX 2.6.x
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWindows_is1;Inno Setup: App Path]"  ## WX 2.4.x
+    PATHS
+      C:/wxWidgets-2.6.2
+      D:/wxWidgets-2.6.2
+      C:/wxWidgets-2.6.1
+      D:/wxWidgets-2.6.1
+      C:/wxWindows-2.4.2
+      D:/wxWindows-2.4.2
+  )
   # message("DBG found WXWINDOWS_ROOT_DIR: ${WXWINDOWS_ROOT_DIR}")
 
 
@@ -600,8 +599,10 @@ else()
     # wx-config should be in your path anyhow, usually no need to set WXWIN or
     # search in ../wx or ../../wx
     find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config
-      $ENV{WXWIN}
-      $ENV{WXWIN}/bin
+      HINTS
+        ENV WXWIN
+        $ENV{WXWIN}/bin
+      PATHS
       ../wx/bin
       ../../wx/bin )