BUG: Remove references to CMAKE_PREFIX_PATH variable. It should not be referenced directly by FIND_* command calls. The commands search it automatically.

2024-11-23 19:49:51 +00:00 · 2008-01-15 21:20:11 -05:00 · 2008-01-15 21:20:11 -05:00 · 52718dbbf2
commit 52718dbbf2
parent 80c2be45e0
29 changed files with 62 additions and 345 deletions
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@ -33,11 +33,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+

 FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
  PATHS
@ -53,11 +49,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
  $ENV{FREETYPE_DIR}/include/freetype2
  NO_DEFAULT_PATH
 )
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include/freetype2
-)
+
 FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
  /usr/local/X11R6/include
  /usr/local/X11/include
@ -75,12 +67,7 @@ FIND_LIBRARY(FREETYPE_LIBRARY
  NO_DEFAULT_PATH
  PATH_SUFFIXES lib64 lib 
 )
-FIND_LIBRARY(FREETYPE_LIBRARY
-  NAMES freetype libfreetype freetype219
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib 
-)
+
 FIND_LIBRARY(FREETYPE_LIBRARY
  NAMES freetype libfreetype freetype219
  PATHS
--- a/Modules/FindGDAL.cmake
+++ b/Modules/FindGDAL.cmake
@ -25,11 +25,7 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
    PATH_SUFFIXES include
 )

-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
+

 FIND_PATH(GDAL_INCLUDE_DIR gdal.h
  PATHS
@ -62,12 +58,7 @@ FIND_LIBRARY(GDAL_LIBRARY
  NO_DEFAULT_PATH
  PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal GDAL
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(GDAL_LIBRARY 
  NAMES gdal GDAL
  PATHS
--- a/Modules/FindGIF.cmake
+++ b/Modules/FindGIF.cmake
@ -16,11 +16,7 @@ FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
  PATH_SUFFIXES include
 )

-FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+

 FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
  PATHS
@ -42,12 +38,7 @@ FIND_LIBRARY(GIF_LIBRARY
  PATH_SUFFIXES lib64 lib
 )

-FIND_LIBRARY(GIF_LIBRARY 
-  NAMES ${POTENTIAL_GIF_LIBS}
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
+

 FIND_LIBRARY(GIF_LIBRARY 
  NAMES ${POTENTIAL_GIF_LIBS}
--- a/Modules/FindLua50.cmake
+++ b/Modules/FindLua50.cmake
@ -18,11 +18,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
 )
-FIND_PATH(LUA_INCLUDE_DIR lua.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
-)
+
 FIND_PATH(LUA_INCLUDE_DIR lua.h
  PATHS
  ~/Library/Frameworks
@ -43,12 +39,7 @@ FIND_LIBRARY(LUA_LIBRARY_lua
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(LUA_LIBRARY_lua 
-  NAMES lua50 lua5.0 lua5 lua
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(LUA_LIBRARY_lua
  NAMES lua50 lua5.0 lua5 lua
  PATHS
@ -76,12 +67,7 @@ ELSE(${LUA_LIBRARY_lua} MATCHES "framework")
    NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
  )
-  FIND_LIBRARY(LUA_LIBRARY_lualib 
-    NAMES lualib50 lualib5.0 lualib5 lualib
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-  )
+
  FIND_LIBRARY(LUA_LIBRARY_lualib 
    NAMES lualib50 lualib5.0 lualib5 lualib
    PATHS
--- a/Modules/FindLua51.cmake
+++ b/Modules/FindLua51.cmake
@ -18,11 +18,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
 )
-FIND_PATH(LUA_INCLUDE_DIR lua.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
-)
+
 FIND_PATH(LUA_INCLUDE_DIR lua.h
  PATHS
  ~/Library/Frameworks
@ -43,12 +39,7 @@ FIND_LIBRARY(LUA_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(LUA_LIBRARY 
-  NAMES lua51 lua5.1 lua
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(LUA_LIBRARY
  NAMES lua51 lua5.1 lua
  PATHS
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@ -54,11 +54,7 @@ FIND_PATH(OPENAL_INCLUDE_DIR al.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include/AL include/OpenAL include
 )
-FIND_PATH(OPENAL_INCLUDE_DIR al.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include/AL include/OpenAL include
-)
+
 FIND_PATH(OPENAL_INCLUDE_DIR al.h
  PATHS
  ~/Library/Frameworks
@ -80,12 +76,7 @@ FIND_LIBRARY(OPENAL_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
 )
-FIND_LIBRARY(OPENAL_LIBRARY 
-  NAMES OpenAL al openal OpenAL32
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
-)
+
 FIND_LIBRARY(OPENAL_LIBRARY 
  NAMES OpenAL al openal OpenAL32
  PATHS
--- a/Modules/FindOpenThreads.cmake
+++ b/Modules/FindOpenThreads.cmake
@ -37,10 +37,6 @@
 # If nothing is found, then the second find will search the
 # standard install paths.
 # Explicit -DVAR=value arguments should still be able to override everything.
-# Note: We have added an additional check for ${CMAKE_PREFIX_PATH}.
-# This is not an official CMake variable, but one we are proposing be
-# added to CMake. Be warned that this may go away or the variable name
-# may change.

 FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
    PATHS
@ -55,11 +51,7 @@ FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
    NO_DEFAULT_PATH
 )

-FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
+

 FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
    ~/Library/Frameworks
@ -92,12 +84,7 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
    NO_DEFAULT_PATH
 )

-FIND_LIBRARY(OPENTHREADS_LIBRARY 
-    NAMES OpenThreads OpenThreadsWin32 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+

 FIND_LIBRARY(OPENTHREADS_LIBRARY 
    NAMES OpenThreads OpenThreadsWin32 
@ -139,12 +126,7 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
    NO_DEFAULT_PATH
 )

-FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
-    NAMES OpenThreadsd OpenThreadsWin32d
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+

 FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
    NAMES OpenThreadsd OpenThreadsWin32d
--- a/Modules/FindPhysFS.cmake
+++ b/Modules/FindPhysFS.cmake
@ -16,11 +16,7 @@ FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
  PATHS
  ~/Library/Frameworks
@ -41,12 +37,7 @@ FIND_LIBRARY(PHYSFS_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(PHYSFS_LIBRARY 
-  NAMES physfs
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(PHYSFS_LIBRARY 
  NAMES physfs
  PATHS
--- a/Modules/FindProducer.cmake
+++ b/Modules/FindProducer.cmake
@ -37,11 +37,7 @@ FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
  PATHS
    ~/Library/Frameworks
@ -65,12 +61,7 @@ FIND_LIBRARY(PRODUCER_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(PRODUCER_LIBRARY 
-  NAMES Producer
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(PRODUCER_LIBRARY 
  NAMES Producer
  PATHS
--- a/Modules/FindQuickTime.cmake
+++ b/Modules/FindQuickTime.cmake
@ -21,11 +21,7 @@ ELSE(APPLE)
    $ENV{QUICKTIME_DIR}
    NO_DEFAULT_PATH
  )
-  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-  )
+
  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h)

  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
@ -33,11 +29,7 @@ ELSE(APPLE)
    $ENV{QUICKTIME_DIR}
    NO_DEFAULT_PATH
  )
-  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-  )
+
  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
 ENDIF(APPLE)

--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@ -58,11 +58,7 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(SDL_INCLUDE_DIR SDL.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(SDL_INCLUDE_DIR SDL.h
  PATHS
  ~/Library/Frameworks
@ -95,12 +91,7 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(SDL_LIBRARY_TEMP 
-  NAMES SDL SDL-1.1
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(SDL_LIBRARY_TEMP 
  NAMES SDL SDL-1.1
  PATHS
@ -128,12 +119,7 @@ IF(NOT SDL_BUILDING_LIBRARY)
      NO_DEFAULT_PATH
      PATH_SUFFIXES lib64 lib
    )
-    FIND_LIBRARY(SDLMAIN_LIBRARY 
-      NAMES SDLmain SDLmain-1.1
-      PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-      NO_DEFAULT_PATH
-      PATH_SUFFIXES lib64 lib
-    )
+
    FIND_LIBRARY(SDLMAIN_LIBRARY 
      NAMES SDLmain SDLmain-1.1
      PATHS
--- a/Modules/FindSDL_image.cmake
+++ b/Modules/FindSDL_image.cmake
@ -19,11 +19,7 @@ FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
  PATHS
  ~/Library/Frameworks
@ -54,12 +50,7 @@ FIND_LIBRARY(SDLIMAGE_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(SDLIMAGE_LIBRARY 
-  NAMES SDL_image
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(SDLIMAGE_LIBRARY 
  NAMES SDL_image
  PATHS
--- a/Modules/FindSDL_mixer.cmake
+++ b/Modules/FindSDL_mixer.cmake
@ -19,11 +19,7 @@ FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
  PATHS
  ~/Library/Frameworks
@ -54,12 +50,7 @@ FIND_LIBRARY(SDLMIXER_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(SDLMIXER_LIBRARY 
-  NAMES SDL_mixer
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(SDLMIXER_LIBRARY 
  NAMES SDL_mixer
  PATHS
--- a/Modules/FindSDL_net.cmake
+++ b/Modules/FindSDL_net.cmake
@ -20,11 +20,7 @@ FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
  PATHS
  ~/Library/Frameworks
@ -54,12 +50,7 @@ FIND_LIBRARY(SDLNET_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(SDLNET_LIBRARY 
-  NAMES SDL_net
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(SDLNET_LIBRARY 
  NAMES SDL_net
  PATHS
--- a/Modules/FindSDL_ttf.cmake
+++ b/Modules/FindSDL_ttf.cmake
@ -20,11 +20,7 @@ FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
  PATHS
  ~/Library/Frameworks
@ -55,12 +51,7 @@ FIND_LIBRARY(SDLTTF_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(SDLTTF_LIBRARY 
-  NAMES SDL_ttf
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(SDLTTF_LIBRARY 
  NAMES SDL_ttf
  PATHS
--- a/Modules/Findosg.cmake
+++ b/Modules/Findosg.cmake
@ -33,11 +33,7 @@ FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
  PATHS
    ~/Library/Frameworks
@ -61,12 +57,7 @@ FIND_LIBRARY(OSG_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSG_LIBRARY 
-  NAMES osg
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSG_LIBRARY 
  NAMES osg
  PATHS
--- a/Modules/FindosgDB.cmake
+++ b/Modules/FindosgDB.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGDB_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGDB_LIBRARY 
-  NAMES osgDB
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGDB_LIBRARY 
  NAMES osgDB
  PATHS
--- a/Modules/FindosgFX.cmake
+++ b/Modules/FindosgFX.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGFX_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGFX_LIBRARY 
-  NAMES osgFX
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGFX_LIBRARY 
  NAMES osgFX
  PATHS
--- a/Modules/FindosgGA.cmake
+++ b/Modules/FindosgGA.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGGA_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGGA_LIBRARY 
-  NAMES osgGA
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGGA_LIBRARY 
  NAMES osgGA
  PATHS
--- a/Modules/FindosgIntrospection.cmake
+++ b/Modules/FindosgIntrospection.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGINTROSPECTION_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGINTROSPECTION_LIBRARY 
-  NAMES osgIntrospection
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGINTROSPECTION_LIBRARY 
  NAMES osgIntrospection
  PATHS
--- a/Modules/FindosgManipulator.cmake
+++ b/Modules/FindosgManipulator.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGMANIPULATOR_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGMANIPULATOR_LIBRARY 
-  NAMES osgManipulator
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGMANIPULATOR_LIBRARY 
  NAMES osgManipulator
  PATHS
--- a/Modules/FindosgParticle.cmake
+++ b/Modules/FindosgParticle.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGPARTICLE_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGPARTICLE_LIBRARY 
-  NAMES osgParticle
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGPARTICLE_LIBRARY 
  NAMES osgParticle
  PATHS
--- a/Modules/FindosgProducer.cmake
+++ b/Modules/FindosgProducer.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGPRODUCER_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGPRODUCER_LIBRARY 
-  NAMES osgProducer
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGPRODUCER_LIBRARY 
  NAMES osgProducer
  PATHS
--- a/Modules/FindosgShadow.cmake
+++ b/Modules/FindosgShadow.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGSHADOW_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGSHADOW_LIBRARY 
-  NAMES osgShadow
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGSHADOW_LIBRARY 
  NAMES osgShadow
  PATHS
--- a/Modules/FindosgSim.cmake
+++ b/Modules/FindosgSim.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGSIM_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGSIM_LIBRARY 
-  NAMES osgSim
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGSIM_LIBRARY 
  NAMES osgSim
  PATHS
--- a/Modules/FindosgTerrain.cmake
+++ b/Modules/FindosgTerrain.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGTERRAIN_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGTERRAIN_LIBRARY 
-  NAMES osgTerrain
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGTERRAIN_LIBRARY 
  NAMES osgTerrain
  PATHS
--- a/Modules/FindosgText.cmake
+++ b/Modules/FindosgText.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGTEXT_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGTEXT_LIBRARY 
-  NAMES osgText
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGTEXT_LIBRARY 
  NAMES osgText
  PATHS
--- a/Modules/FindosgUtil.cmake
+++ b/Modules/FindosgUtil.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGUTIL_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGUTIL_LIBRARY 
-  NAMES osgUtil
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGUTIL_LIBRARY 
  NAMES osgUtil
  PATHS
--- a/Modules/FindosgViewer.cmake
+++ b/Modules/FindosgViewer.cmake
@ -34,11 +34,7 @@ FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
  NO_DEFAULT_PATH
  PATH_SUFFIXES include
 )
-FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
+
 FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
  PATHS
    ~/Library/Frameworks
@ -63,12 +59,7 @@ FIND_LIBRARY(OSGVIEWER_LIBRARY
  NO_DEFAULT_PATH
    PATH_SUFFIXES lib64 lib
 )
-FIND_LIBRARY(OSGVIEWER_LIBRARY 
-  NAMES osgViewer
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+
 FIND_LIBRARY(OSGVIEWER_LIBRARY 
  NAMES osgViewer
  PATHS