[cmake-commits] king committed FindFreetype.cmake 1.3 1.4 FindGDAL.cmake 1.1 1.2 FindGIF.cmake 1.2 1.3 FindLua50.cmake 1.1 1.2 FindLua51.cmake 1.1 1.2 FindOpenAL.cmake 1.8 1.9 FindOpenThreads.cmake 1.1 1.2 FindPhysFS.cmake 1.7 1.8 FindProducer.cmake 1.1 1.2 FindQuickTime.cmake 1.1 1.2 FindSDL.cmake 1.13 1.14 FindSDL_image.cmake 1.6 1.7 FindSDL_mixer.cmake 1.6 1.7 FindSDL_net.cmake 1.6 1.7 FindSDL_ttf.cmake 1.6 1.7 Findosg.cmake 1.1 1.2 FindosgDB.cmake 1.1 1.2 FindosgFX.cmake 1.1 1.2 FindosgGA.cmake 1.1 1.2 FindosgIntrospection.cmake 1.1 1.2 FindosgManipulator.cmake 1.1 1.2 FindosgParticle.cmake 1.1 1.2 FindosgProducer.cmake 1.1 1.2 FindosgShadow.cmake 1.1 1.2 FindosgSim.cmake 1.1 1.2 FindosgTerrain.cmake 1.1 1.2 FindosgText.cmake 1.1 1.2 FindosgUtil.cmake 1.1 1.2 FindosgViewer.cmake 1.1 1.2

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Jan 15 21:20:14 EST 2008


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv25195/Modules

Modified Files:
	FindFreetype.cmake FindGDAL.cmake FindGIF.cmake 
	FindLua50.cmake FindLua51.cmake FindOpenAL.cmake 
	FindOpenThreads.cmake FindPhysFS.cmake FindProducer.cmake 
	FindQuickTime.cmake FindSDL.cmake FindSDL_image.cmake 
	FindSDL_mixer.cmake FindSDL_net.cmake FindSDL_ttf.cmake 
	Findosg.cmake FindosgDB.cmake FindosgFX.cmake FindosgGA.cmake 
	FindosgIntrospection.cmake FindosgManipulator.cmake 
	FindosgParticle.cmake FindosgProducer.cmake 
	FindosgShadow.cmake FindosgSim.cmake FindosgTerrain.cmake 
	FindosgText.cmake FindosgUtil.cmake FindosgViewer.cmake 
Log Message:
BUG: Remove references to CMAKE_PREFIX_PATH variable.  It should not be referenced directly by FIND_* command calls.  The commands search it automatically.


Index: FindSDL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- FindSDL.cmake	21 Dec 2007 01:59:44 -0000	1.13
+++ FindSDL.cmake	16 Jan 2008 02:20:11 -0000	1.14
@@ -58,11 +58,7 @@
   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 @@
   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 @@
       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

Index: FindLua50.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLua50.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindLua50.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindLua50.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -18,11 +18,7 @@
   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 @@
   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 @@
     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

Index: Findosg.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Findosg.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Findosg.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ Findosg.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -33,11 +33,7 @@
   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 @@
   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

Index: FindosgGA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgGA.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgGA.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgGA.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindLua51.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLua51.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindLua51.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindLua51.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -18,11 +18,7 @@
   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 @@
   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

Index: FindSDL_ttf.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_ttf.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FindSDL_ttf.cmake	21 Dec 2007 01:59:44 -0000	1.6
+++ FindSDL_ttf.cmake	16 Jan 2008 02:20:11 -0000	1.7
@@ -20,11 +20,7 @@
   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 @@
   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

Index: FindOpenThreads.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenThreads.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindOpenThreads.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindOpenThreads.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -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 @@
     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 @@
     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 @@
     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

Index: FindosgShadow.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgShadow.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgShadow.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgShadow.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindosgDB.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgDB.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgDB.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgDB.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindSDL_image.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_image.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FindSDL_image.cmake	21 Dec 2007 01:59:44 -0000	1.6
+++ FindSDL_image.cmake	16 Jan 2008 02:20:11 -0000	1.7
@@ -19,11 +19,7 @@
   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 @@
   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

Index: FindFreetype.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindFreetype.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FindFreetype.cmake	4 Jan 2008 17:38:34 -0000	1.3
+++ FindFreetype.cmake	16 Jan 2008 02:20:11 -0000	1.4
@@ -33,11 +33,7 @@
   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 @@
   $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 @@
   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

Index: FindSDL_net.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_net.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FindSDL_net.cmake	21 Dec 2007 01:59:44 -0000	1.6
+++ FindSDL_net.cmake	16 Jan 2008 02:20:11 -0000	1.7
@@ -20,11 +20,7 @@
   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 @@
   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

Index: FindGDAL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGDAL.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindGDAL.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindGDAL.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -25,11 +25,7 @@
     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 @@
   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

Index: FindosgParticle.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgParticle.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgParticle.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgParticle.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindosgTerrain.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgTerrain.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgTerrain.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgTerrain.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindosgText.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgText.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgText.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgText.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindSDL_mixer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_mixer.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FindSDL_mixer.cmake	21 Dec 2007 01:59:44 -0000	1.6
+++ FindSDL_mixer.cmake	16 Jan 2008 02:20:11 -0000	1.7
@@ -19,11 +19,7 @@
   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 @@
   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

Index: FindosgProducer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgProducer.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgProducer.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgProducer.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindosgUtil.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgUtil.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgUtil.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgUtil.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindosgViewer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgViewer.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgViewer.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgViewer.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindQuickTime.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQuickTime.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindQuickTime.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindQuickTime.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -21,11 +21,7 @@
     $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 @@
     $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)
 

Index: FindosgIntrospection.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgIntrospection.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgIntrospection.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgIntrospection.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindPhysFS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPhysFS.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- FindPhysFS.cmake	21 Dec 2007 01:59:44 -0000	1.7
+++ FindPhysFS.cmake	16 Jan 2008 02:20:11 -0000	1.8
@@ -16,11 +16,7 @@
   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 @@
   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

Index: FindosgFX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgFX.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgFX.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgFX.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindOpenAL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenAL.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- FindOpenAL.cmake	4 Jan 2008 16:42:08 -0000	1.8
+++ FindOpenAL.cmake	16 Jan 2008 02:20:11 -0000	1.9
@@ -54,11 +54,7 @@
   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 @@
   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

Index: FindGIF.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGIF.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindGIF.cmake	4 Jan 2008 17:38:34 -0000	1.2
+++ FindGIF.cmake	16 Jan 2008 02:20:11 -0000	1.3
@@ -16,11 +16,7 @@
   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 @@
   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}

Index: FindosgManipulator.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgManipulator.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgManipulator.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgManipulator.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindosgSim.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgSim.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindosgSim.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindosgSim.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -34,11 +34,7 @@
   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 @@
   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

Index: FindProducer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindProducer.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindProducer.cmake	21 Dec 2007 01:59:44 -0000	1.1
+++ FindProducer.cmake	16 Jan 2008 02:20:11 -0000	1.2
@@ -37,11 +37,7 @@
   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 @@
   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



More information about the Cmake-commits mailing list