[Cmake-commits] [cmake-commits] king committed CMakeFindBinUtils.cmake 1.15 1.16 FindCurses.cmake 1.15 1.16 FindFreetype.cmake 1.4 1.5 FindGDAL.cmake 1.2 1.3 FindGIF.cmake 1.3 1.4 FindKDE3.cmake 1.10 1.11 FindKDE4.cmake 1.11 1.12 FindLua50.cmake 1.3 1.4 FindLua51.cmake 1.4 1.5 FindOpenAL.cmake 1.10 1.11 FindOpenThreads.cmake 1.2 1.3 FindPhysFS.cmake 1.8 1.9 FindProducer.cmake 1.2 1.3 FindQt3.cmake 1.16 1.17 FindQuickTime.cmake 1.2 1.3 FindSDL.cmake 1.15 1.16 FindSDL_image.cmake 1.7 1.8 FindSDL_mixer.cmake 1.7 1.8 FindSDL_net.cmake 1.7 1.8 FindSDL_sound.cmake 1.8 1.9 FindSDL_ttf.cmake 1.7 1.8 FindTCL.cmake 1.54 1.55 FindTclsh.cmake 1.23 1.24 FindWish.cmake 1.16 1.17 FindXMLRPC.cmake 1.2 1.3 Findosg.cmake 1.2 1.3 FindosgDB.cmake 1.2 1.3 FindosgFX.cmake 1.2 1.3 FindosgGA.cmake 1.2 1.3 FindosgIntrospection.cmake 1.2 1.3 FindosgManipulator.cmake 1.2 1.3 FindosgParticle.cmake 1.2 1.3 FindosgProducer.cmake 1.2 1.3 FindosgShadow.cmake 1.2 1.3 FindosgSim.cmake 1.2 1.3 FindosgTerrain.cmake 1.2 1.3 FindosgText.cmake 1.2 1.3 FindosgUtil.cmake 1.2 1.3 FindosgViewer.cmake 1.2 1.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Jun 9 16:04:08 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv24840/Modules
Modified Files:
CMakeFindBinUtils.cmake FindCurses.cmake FindFreetype.cmake
FindGDAL.cmake FindGIF.cmake FindKDE3.cmake FindKDE4.cmake
FindLua50.cmake FindLua51.cmake FindOpenAL.cmake
FindOpenThreads.cmake FindPhysFS.cmake FindProducer.cmake
FindQt3.cmake FindQuickTime.cmake FindSDL.cmake
FindSDL_image.cmake FindSDL_mixer.cmake FindSDL_net.cmake
FindSDL_sound.cmake FindSDL_ttf.cmake FindTCL.cmake
FindTclsh.cmake FindWish.cmake FindXMLRPC.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:
ENH: Cleanup Find* modules with new HINTS feature
- The find_* commands now provide a HINTS option.
- The option specifies paths to be preferred over the system paths.
- Many Find* modules were using two find calls with NO_DEFAULT_PATH
to approximate the behavior, but that blocked users from overriding
things with CMAKE_PREFIX_PATH.
- This commit uses the HINTS feature to get desired behavior in
only one find command call.
Index: FindSDL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** FindSDL.cmake 25 Apr 2008 13:07:02 -0000 1.15
--- FindSDL.cmake 9 Jun 2008 20:04:06 -0000 1.16
***************
*** 54,64 ****
FIND_PATH(SDL_INCLUDE_DIR SDL.h
! PATHS
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(SDL_INCLUDE_DIR SDL.h
PATHS
~/Library/Frameworks
--- 54,60 ----
FIND_PATH(SDL_INCLUDE_DIR SDL.h
! HINTS
$ENV{SDLDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 87,98 ****
FIND_LIBRARY(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1
! PATHS
$ENV{SDLDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(SDL_LIBRARY_TEMP
! NAMES SDL SDL-1.1
PATHS
/usr/local
--- 83,89 ----
FIND_LIBRARY(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1
! HINTS
$ENV{SDLDIR}
! PATH_SUFFIXES lib64 lib
PATHS
/usr/local
***************
*** 102,106 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 93,96 ----
***************
*** 115,126 ****
FIND_LIBRARY(SDLMAIN_LIBRARY
NAMES SDLmain SDLmain-1.1
! PATHS
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
- )
-
- FIND_LIBRARY(SDLMAIN_LIBRARY
- NAMES SDLmain SDLmain-1.1
PATHS
/usr/local
--- 105,111 ----
FIND_LIBRARY(SDLMAIN_LIBRARY
NAMES SDLmain SDLmain-1.1
! HINTS
$ENV{SDLDIR}
PATH_SUFFIXES lib64 lib
PATHS
/usr/local
***************
*** 130,134 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
--- 115,118 ----
Index: FindLua50.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLua50.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** FindLua50.cmake 10 Mar 2008 17:26:11 -0000 1.3
--- FindLua50.cmake 9 Jun 2008 20:04:05 -0000 1.4
***************
*** 14,24 ****
FIND_PATH(LUA_INCLUDE_DIR lua.h
! PATHS
$ENV{LUA_DIR}
- 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
--- 14,20 ----
FIND_PATH(LUA_INCLUDE_DIR lua.h
! HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
PATHS
~/Library/Frameworks
***************
*** 30,46 ****
/opt/csw # Blastwave
/opt
- PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
)
FIND_LIBRARY(LUA_LIBRARY_lua
NAMES lua50 lua5.0 lua5 lua
! PATHS
$ENV{LUA_DIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(LUA_LIBRARY_lua
! NAMES lua50 lua5.0 lua5 lua
PATHS
~/Library/Frameworks
--- 26,36 ----
/opt/csw # Blastwave
/opt
)
FIND_LIBRARY(LUA_LIBRARY_lua
NAMES lua50 lua5.0 lua5 lua
! HINTS
$ENV{LUA_DIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 52,56 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 42,45 ----
***************
*** 62,74 ****
FIND_LIBRARY(LUA_LIBRARY_lualib
NAMES lualib50 lualib5.0 lualib5 lualib
! PATHS
$ENV{LUALIB_DIR}
$ENV{LUA_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
- )
-
- FIND_LIBRARY(LUA_LIBRARY_lualib
- NAMES lualib50 lualib5.0 lualib5 lualib
PATHS
/usr/local
--- 51,58 ----
FIND_LIBRARY(LUA_LIBRARY_lualib
NAMES lualib50 lualib5.0 lualib5 lualib
! HINTS
$ENV{LUALIB_DIR}
$ENV{LUA_DIR}
PATH_SUFFIXES lib64 lib
PATHS
/usr/local
***************
*** 78,82 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua)
--- 62,65 ----
Index: Findosg.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Findosg.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** Findosg.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- Findosg.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,39 ****
# Try the user's environment request before anything else.
FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
! PATHS
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
PATHS
~/Library/Frameworks
--- 28,35 ----
# Try the user's environment request before anything else.
FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
! HINTS
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 47,64 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSG_LIBRARY
NAMES osg
! PATHS
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSG_LIBRARY
! NAMES osg
PATHS
~/Library/Frameworks
--- 43,54 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSG_LIBRARY
NAMES osg
! HINTS
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 70,74 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 60,63 ----
Index: FindGDAL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGDAL.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindGDAL.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindGDAL.cmake 9 Jun 2008 20:04:05 -0000 1.3
***************
*** 21,32 ****
FIND_PATH(GDAL_INCLUDE_DIR gdal.h
$ENV{GDAL_DIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES include
! )
!
!
!
! FIND_PATH(GDAL_INCLUDE_DIR gdal.h
PATHS
~/Library/Frameworks/gdal.framework/Headers
--- 21,27 ----
FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+ HINTS
$ENV{GDAL_DIR}
! PATH_SUFFIXES include
PATHS
~/Library/Frameworks/gdal.framework/Headers
***************
*** 54,65 ****
FIND_LIBRARY(GDAL_LIBRARY
NAMES gdal GDAL
! PATHS
$ENV{GDAL_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
- )
-
- FIND_LIBRARY(GDAL_LIBRARY
- NAMES gdal GDAL
PATHS
~/Library/Frameworks
--- 49,55 ----
FIND_LIBRARY(GDAL_LIBRARY
NAMES gdal GDAL
! HINTS
$ENV{GDAL_DIR}
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 73,77 ****
/usr/freeware
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
- PATH_SUFFIXES lib64 lib
)
--- 63,66 ----
Index: FindosgGA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgGA.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgGA.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgGA.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
! PATHS
$ENV{OSGGA_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
! HINTS
$ENV{OSGGA_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGGA_LIBRARY
NAMES osgGA
! PATHS
$ENV{OSGGA_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGGA_LIBRARY
! NAMES osgGA
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGGA_LIBRARY
NAMES osgGA
! HINTS
$ENV{OSGGA_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindWish.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindWish.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** FindWish.cmake 26 Jan 2008 06:11:04 -0000 1.16
--- FindWish.cmake 9 Jun 2008 20:04:06 -0000 1.17
***************
*** 66,74 ****
FIND_PROGRAM(TK_WISH
NAMES ${TK_WISH_NAMES}
! PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
! )
! FIND_PROGRAM(TK_WISH
! NAMES ${TK_WISH_NAMES}
! PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
)
--- 66,70 ----
FIND_PROGRAM(TK_WISH
NAMES ${TK_WISH_NAMES}
! HINTS ${TCLTK_POSSIBLE_BIN_PATHS}
)
Index: FindSDL_sound.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_sound.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** FindSDL_sound.cmake 25 Apr 2008 13:07:02 -0000 1.8
--- FindSDL_sound.cmake 9 Jun 2008 20:04:06 -0000 1.9
***************
*** 63,76 ****
# Find SDL_sound.h
FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
$ENV{SDLSOUNDDIR}/include
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/include
$ENV{SDLDIR}
! NO_DEFAULT_PATH
! )
! FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
! NO_DEFAULT_PATH
! )
! FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
/usr/local/include/SDL
/usr/include/SDL
--- 63,72 ----
# Find SDL_sound.h
FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
+ HINTS
$ENV{SDLSOUNDDIR}/include
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/include
$ENV{SDLDIR}
! PATHS
/usr/local/include/SDL
/usr/include/SDL
***************
*** 93,101 ****
FIND_LIBRARY(SDL_SOUND_LIBRARY
NAMES SDL_sound
! PATHS
$ENV{SDLSOUNDDIR}/lib
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
/usr/local/lib
/usr/lib
--- 89,98 ----
FIND_LIBRARY(SDL_SOUND_LIBRARY
NAMES SDL_sound
! HINTS
$ENV{SDLSOUNDDIR}/lib
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
+ PATHS
/usr/local/lib
/usr/lib
Index: FindLua51.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLua51.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** FindLua51.cmake 2 Jun 2008 18:53:27 -0000 1.4
--- FindLua51.cmake 9 Jun 2008 20:04:05 -0000 1.5
***************
*** 14,24 ****
FIND_PATH(LUA_INCLUDE_DIR lua.h
! PATHS
$ENV{LUA_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
- )
-
- FIND_PATH(LUA_INCLUDE_DIR lua.h
PATHS
~/Library/Frameworks
--- 14,20 ----
FIND_PATH(LUA_INCLUDE_DIR lua.h
! HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
PATHS
~/Library/Frameworks
***************
*** 30,46 ****
/opt/csw # Blastwave
/opt
- PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
)
FIND_LIBRARY(LUA_LIBRARY
NAMES lua51 lua5.1 lua
! PATHS
$ENV{LUA_DIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(LUA_LIBRARY
! NAMES lua51 lua5.1 lua
PATHS
~/Library/Frameworks
--- 26,36 ----
/opt/csw # Blastwave
/opt
)
FIND_LIBRARY(LUA_LIBRARY
NAMES lua51 lua5.1 lua
! HINTS
$ENV{LUA_DIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 52,56 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 42,45 ----
Index: FindSDL_ttf.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_ttf.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** FindSDL_ttf.cmake 16 Jan 2008 02:20:11 -0000 1.7
--- FindSDL_ttf.cmake 9 Jun 2008 20:04:06 -0000 1.8
***************
*** 13,26 ****
# additional Unix paths (FreeBSD, etc).
-
FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
! PATHS
$ENV{SDLTTFDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
PATHS
~/Library/Frameworks
--- 13,21 ----
# additional Unix paths (FreeBSD, etc).
FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
! HINTS
$ENV{SDLTTFDIR}
$ENV{SDLDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 46,58 ****
FIND_LIBRARY(SDLTTF_LIBRARY
NAMES SDL_ttf
! PATHS
$ENV{SDLTTFDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
- )
-
- FIND_LIBRARY(SDLTTF_LIBRARY
- NAMES SDL_ttf
PATHS
~/Library/Frameworks
--- 41,47 ----
FIND_LIBRARY(SDLTTF_LIBRARY
NAMES SDL_ttf
! HINTS
$ENV{SDLTTFDIR}
$ENV{SDLDIR}
PATHS
~/Library/Frameworks
Index: FindOpenThreads.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenThreads.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindOpenThreads.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindOpenThreads.cmake 9 Jun 2008 20:04:05 -0000 1.3
***************
*** 40,44 ****
FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
! PATHS
$ENV{OPENTHREADS_INCLUDE_DIR}
$ENV{OPENTHREADS_DIR}/include
--- 40,44 ----
FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
! HINTS
$ENV{OPENTHREADS_INCLUDE_DIR}
$ENV{OPENTHREADS_DIR}/include
***************
*** 49,58 ****
$ENV{OSGDIR}/include
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! )
!
!
!
! FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
~/Library/Frameworks
/Library/Frameworks
--- 49,53 ----
$ENV{OSGDIR}/include
$ENV{OSGDIR}
! PATHS
~/Library/Frameworks
/Library/Frameworks
***************
*** 70,74 ****
FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
! PATHS
$ENV{OPENTHREADS_LIBRARY_DIR}
$ENV{OPENTHREADS_DIR}/lib64
--- 65,69 ----
FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
! HINTS
$ENV{OPENTHREADS_LIBRARY_DIR}
$ENV{OPENTHREADS_DIR}/lib64
***************
*** 82,92 ****
$ENV{OSGDIR}/lib
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- )
-
-
-
- FIND_LIBRARY(OPENTHREADS_LIBRARY
- NAMES OpenThreads OpenThreadsWin32
PATHS
~/Library/Frameworks
--- 77,80 ----
***************
*** 111,115 ****
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
! PATHS
$ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
$ENV{OPENTHREADS_LIBRARY_DIR}
--- 99,103 ----
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
! HINTS
$ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
$ENV{OPENTHREADS_LIBRARY_DIR}
***************
*** 124,134 ****
$ENV{OSGDIR}/lib
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- )
-
-
-
- FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
- NAMES OpenThreadsd OpenThreadsWin32d
PATHS
/usr/local/lib64
--- 112,115 ----
Index: FindTclsh.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTclsh.cmake,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** FindTclsh.cmake 26 Jan 2008 06:11:04 -0000 1.23
--- FindTclsh.cmake 9 Jun 2008 20:04:06 -0000 1.24
***************
*** 67,75 ****
FIND_PROGRAM(TCL_TCLSH
NAMES ${TCL_TCLSH_NAMES}
! PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
! )
! FIND_PROGRAM(TCL_TCLSH
! NAMES ${TCL_TCLSH_NAMES}
! PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
)
--- 67,71 ----
FIND_PROGRAM(TCL_TCLSH
NAMES ${TCL_TCLSH_NAMES}
! HINTS ${TCLTK_POSSIBLE_BIN_PATHS}
)
Index: FindosgShadow.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgShadow.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgShadow.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgShadow.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
! PATHS
$ENV{OSGSHADOW_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
! HINTS
$ENV{OSGSHADOW_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGSHADOW_LIBRARY
NAMES osgShadow
! PATHS
$ENV{OSGSHADOW_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGSHADOW_LIBRARY
! NAMES osgShadow
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGSHADOW_LIBRARY
NAMES osgShadow
! HINTS
$ENV{OSGSHADOW_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindosgDB.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgDB.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgDB.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgDB.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
! PATHS
$ENV{OSGDB_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
! HINTS
$ENV{OSGDB_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGDB_LIBRARY
NAMES osgDB
! PATHS
$ENV{OSGDB_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGDB_LIBRARY
! NAMES osgDB
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGDB_LIBRARY
NAMES osgDB
! HINTS
$ENV{OSGDB_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindSDL_image.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_image.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** FindSDL_image.cmake 16 Jan 2008 02:20:11 -0000 1.7
--- FindSDL_image.cmake 9 Jun 2008 20:04:06 -0000 1.8
***************
*** 14,25 ****
FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
! PATHS
$ENV{SDLIMAGEDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
PATHS
~/Library/Frameworks
--- 14,21 ----
FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
! HINTS
$ENV{SDLIMAGEDIR}
$ENV{SDLDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 45,57 ****
FIND_LIBRARY(SDLIMAGE_LIBRARY
NAMES SDL_image
! PATHS
$ENV{SDLIMAGEDIR}
$ENV{SDLDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(SDLIMAGE_LIBRARY
! NAMES SDL_image
PATHS
~/Library/Frameworks
--- 41,48 ----
FIND_LIBRARY(SDLIMAGE_LIBRARY
NAMES SDL_image
! HINTS
$ENV{SDLIMAGEDIR}
$ENV{SDLDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 63,67 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 54,57 ----
Index: CMakeFindBinUtils.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFindBinUtils.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** CMakeFindBinUtils.cmake 1 Mar 2008 17:51:07 -0000 1.15
--- CMakeFindBinUtils.cmake 9 Jun 2008 20:04:05 -0000 1.16
***************
*** 23,28 ****
OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
! FIND_PROGRAM(CMAKE_LINKER NAMES link PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
! FIND_PROGRAM(CMAKE_LINKER NAMES link)
MARK_AS_ADVANCED(CMAKE_LINKER)
--- 23,27 ----
OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
! FIND_PROGRAM(CMAKE_LINKER NAMES link HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
MARK_AS_ADVANCED(CMAKE_LINKER)
***************
*** 33,59 ****
OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
! FIND_PROGRAM(CMAKE_AR NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ar PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
! FIND_PROGRAM(CMAKE_AR NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ar)
! FIND_PROGRAM(CMAKE_RANLIB NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ranlib ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
! FIND_PROGRAM(CMAKE_RANLIB NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ranlib)
IF(NOT CMAKE_RANLIB)
SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
ENDIF(NOT CMAKE_RANLIB)
! FIND_PROGRAM(CMAKE_STRIP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}strip PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
! FIND_PROGRAM(CMAKE_STRIP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}strip)
!
! FIND_PROGRAM(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
! FIND_PROGRAM(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld)
!
! FIND_PROGRAM(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
! FIND_PROGRAM(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm)
!
! FIND_PROGRAM(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
! FIND_PROGRAM(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump)
!
! FIND_PROGRAM(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
! FIND_PROGRAM(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy)
MARK_AS_ADVANCED(CMAKE_AR CMAKE_RANLIB CMAKE_STRIP CMAKE_LINKER CMAKE_NM CMAKE_OBJDUMP CMAKE_OBJCOPY)
--- 32,47 ----
OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
! FIND_PROGRAM(CMAKE_AR NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ar HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
! FIND_PROGRAM(CMAKE_RANLIB NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ranlib HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
IF(NOT CMAKE_RANLIB)
SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
ENDIF(NOT CMAKE_RANLIB)
! FIND_PROGRAM(CMAKE_STRIP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}strip HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
! FIND_PROGRAM(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
! FIND_PROGRAM(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
! FIND_PROGRAM(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
! FIND_PROGRAM(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
MARK_AS_ADVANCED(CMAKE_AR CMAKE_RANLIB CMAKE_STRIP CMAKE_LINKER CMAKE_NM CMAKE_OBJDUMP CMAKE_OBJCOPY)
***************
*** 66,71 ****
# on Apple there really should be install_name_tool
IF(APPLE)
! FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
! FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool)
IF(NOT CMAKE_INSTALL_NAME_TOOL)
--- 54,58 ----
# on Apple there really should be install_name_tool
IF(APPLE)
! FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
IF(NOT CMAKE_INSTALL_NAME_TOOL)
Index: FindFreetype.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindFreetype.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** FindFreetype.cmake 16 Jan 2008 02:20:11 -0000 1.4
--- FindFreetype.cmake 9 Jun 2008 20:04:05 -0000 1.5
***************
*** 30,40 ****
# everything still works.
FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
$ENV{FREETYPE_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
-
- FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
PATHS
/usr/local/X11R6/include
--- 30,36 ----
# everything still works.
FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
+ HINTS
$ENV{FREETYPE_DIR}
PATH_SUFFIXES include
PATHS
/usr/local/X11R6/include
***************
*** 47,55 ****
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
/usr/local/X11R6/include
/usr/local/X11/include
--- 43,49 ----
FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+ HINTS
$ENV{FREETYPE_DIR}/include/freetype2
! PATHS
/usr/local/X11R6/include
/usr/local/X11/include
***************
*** 63,74 ****
FIND_LIBRARY(FREETYPE_LIBRARY
NAMES freetype libfreetype freetype219
! PATHS
$ENV{FREETYPE_DIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(FREETYPE_LIBRARY
! NAMES freetype libfreetype freetype219
PATHS
/usr/local/X11R6
--- 57,63 ----
FIND_LIBRARY(FREETYPE_LIBRARY
NAMES freetype libfreetype freetype219
! HINTS
$ENV{FREETYPE_DIR}
! PATH_SUFFIXES lib64 lib
PATHS
/usr/local/X11R6
***************
*** 77,81 ****
/sw
/usr/freeware
- PATH_SUFFIXES lib64 lib
)
--- 66,69 ----
Index: FindSDL_net.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_net.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** FindSDL_net.cmake 16 Jan 2008 02:20:11 -0000 1.7
--- FindSDL_net.cmake 9 Jun 2008 20:04:06 -0000 1.8
***************
*** 15,26 ****
FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
! PATHS
$ENV{SDLNETDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
PATHS
~/Library/Frameworks
--- 15,22 ----
FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
! HINTS
$ENV{SDLNETDIR}
$ENV{SDLDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 45,57 ****
FIND_LIBRARY(SDLNET_LIBRARY
NAMES SDL_net
! PATHS
$ENV{SDLNETDIR}
$ENV{SDLDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(SDLNET_LIBRARY
! NAMES SDL_net
PATHS
~/Library/Frameworks
--- 41,48 ----
FIND_LIBRARY(SDLNET_LIBRARY
NAMES SDL_net
! HINTS
$ENV{SDLNETDIR}
$ENV{SDLDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 63,67 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 54,57 ----
Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** FindKDE4.cmake 14 Mar 2008 22:16:06 -0000 1.11
--- FindKDE4.cmake 9 Jun 2008 20:04:05 -0000 1.12
***************
*** 21,34 ****
# the suffix must be used since KDEDIRS can be a list of directories which don't have bin/ appended
PATH_SUFFIXES bin
! PATHS
${CMAKE_INSTALL_PREFIX}
${_KDEDIRS}
/opt/kde4
- NO_DEFAULT_PATH
ONLY_CMAKE_FIND_ROOT_PATH
)
- FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config ONLY_CMAKE_FIND_ROOT_PATH)
-
IF (NOT KDE4_KDECONFIG_EXECUTABLE)
IF (KDE4_FIND_REQUIRED)
--- 21,31 ----
# the suffix must be used since KDEDIRS can be a list of directories which don't have bin/ appended
PATH_SUFFIXES bin
! HINTS
${CMAKE_INSTALL_PREFIX}
${_KDEDIRS}
/opt/kde4
ONLY_CMAKE_FIND_ROOT_PATH
)
IF (NOT KDE4_KDECONFIG_EXECUTABLE)
IF (KDE4_FIND_REQUIRED)
Index: FindCurses.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCurses.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** FindCurses.cmake 10 May 2008 23:07:47 -0000 1.15
--- FindCurses.cmake 9 Jun 2008 20:04:05 -0000 1.16
***************
*** 67,76 ****
FIND_FILE(CURSES_HAVE_NCURSES_NCURSES_H ncurses/ncurses.h)
FIND_FILE(CURSES_HAVE_NCURSES_CURSES_H ncurses/curses.h)
! FIND_FILE(CURSES_HAVE_CURSES_H curses.h PATHS "${_cursesParentDir}/include" NO_DEFAULT_PATH)
! FIND_FILE(CURSES_HAVE_CURSES_H curses.h)
FIND_PATH(CURSES_NCURSES_INCLUDE_PATH ncurses.h ncurses/ncurses.h ncurses/curses.h)
! FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h PATHS "${_cursesParentDir}/include" NO_DEFAULT_PATH)
! FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h)
# for compatibility with older FindCurses.cmake this has to be in the cache
--- 67,74 ----
FIND_FILE(CURSES_HAVE_NCURSES_NCURSES_H ncurses/ncurses.h)
FIND_FILE(CURSES_HAVE_NCURSES_CURSES_H ncurses/curses.h)
! FIND_FILE(CURSES_HAVE_CURSES_H curses.h HINTS "${_cursesParentDir}/include")
FIND_PATH(CURSES_NCURSES_INCLUDE_PATH ncurses.h ncurses/ncurses.h ncurses/curses.h)
! FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h HINTS "${_cursesParentDir}/include")
# for compatibility with older FindCurses.cmake this has to be in the cache
***************
*** 82,89 ****
! FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr PATHS "${_cursesLibDir}" NO_DEFAULT_PATH)
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
! FIND_LIBRARY(CURSES_FORM_LIBRARY form PATHS "${_cursesLibDir}" NO_DEFAULT_PATH)
FIND_LIBRARY(CURSES_FORM_LIBRARY form )
--- 80,87 ----
! FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
! FIND_LIBRARY(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
FIND_LIBRARY(CURSES_FORM_LIBRARY form )
Index: FindosgParticle.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgParticle.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgParticle.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgParticle.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
! PATHS
$ENV{OSGPARTICLE_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
! HINTS
$ENV{OSGPARTICLE_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGPARTICLE_LIBRARY
NAMES osgParticle
! PATHS
$ENV{OSGPARTICLE_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGPARTICLE_LIBRARY
! NAMES osgParticle
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGPARTICLE_LIBRARY
NAMES osgParticle
! HINTS
$ENV{OSGPARTICLE_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindosgTerrain.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgTerrain.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgTerrain.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgTerrain.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
! PATHS
$ENV{OSGTERRAIN_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
! HINTS
$ENV{OSGTERRAIN_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGTERRAIN_LIBRARY
NAMES osgTerrain
! PATHS
$ENV{OSGTERRAIN_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGTERRAIN_LIBRARY
! NAMES osgTerrain
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGTERRAIN_LIBRARY
NAMES osgTerrain
! HINTS
$ENV{OSGTERRAIN_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindosgText.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgText.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgText.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgText.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
! PATHS
$ENV{OSGTEXT_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
! HINTS
$ENV{OSGTEXT_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGTEXT_LIBRARY
NAMES osgText
! PATHS
$ENV{OSGTEXT_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGTEXT_LIBRARY
! NAMES osgText
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGTEXT_LIBRARY
NAMES osgText
! HINTS
$ENV{OSGTEXT_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindSDL_mixer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_mixer.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** FindSDL_mixer.cmake 16 Jan 2008 02:20:11 -0000 1.7
--- FindSDL_mixer.cmake 9 Jun 2008 20:04:06 -0000 1.8
***************
*** 14,25 ****
FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
! PATHS
$ENV{SDLMIXERDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
PATHS
~/Library/Frameworks
--- 14,21 ----
FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
! HINTS
$ENV{SDLMIXERDIR}
$ENV{SDLDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 45,57 ****
FIND_LIBRARY(SDLMIXER_LIBRARY
NAMES SDL_mixer
! PATHS
$ENV{SDLMIXERDIR}
$ENV{SDLDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(SDLMIXER_LIBRARY
! NAMES SDL_mixer
PATHS
~/Library/Frameworks
--- 41,48 ----
FIND_LIBRARY(SDLMIXER_LIBRARY
NAMES SDL_mixer
! HINTS
$ENV{SDLMIXERDIR}
$ENV{SDLDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 63,67 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 54,57 ----
Index: FindXMLRPC.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindXMLRPC.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindXMLRPC.cmake 4 Dec 2006 16:44:47 -0000 1.2
--- FindXMLRPC.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 102,109 ****
FIND_LIBRARY(XMLRPC_${name}_LIBRARY
NAMES ${name}
! PATHS ${XMLRPC_LIBRARY_DIRS}
! NO_DEFAULT_PATH
)
- FIND_LIBRARY(XMLRPC_${name}_LIBRARY NAMES ${name})
MARK_AS_ADVANCED(XMLRPC_${name}_LIBRARY)
--- 102,107 ----
FIND_LIBRARY(XMLRPC_${name}_LIBRARY
NAMES ${name}
! HINTS ${XMLRPC_LIBRARY_DIRS}
)
MARK_AS_ADVANCED(XMLRPC_${name}_LIBRARY)
Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** FindKDE3.cmake 17 Jul 2007 12:41:20 -0000 1.10
--- FindKDE3.cmake 9 Jun 2008 20:04:05 -0000 1.11
***************
*** 104,128 ****
#SET(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
- # all calls to FIND_PROGRAM/PATH/LIBRARY() follow the same scheme:
- # at first try some special paths with the argument "NO_DEFAULT_PATH"
- # so only these paths are checked
- # this is followed by a second call to FIND_PROGRAM/PATH/LIBRARY()
- # but this time without any paths and without NO_DEFAULT_PATH
- # this second call will do nothing if the first call already found
- # what it was looking for, if not, it will search only in the default
- # directories (/usr, /usr/local, etc.)
-
#now try to find some kde stuff
! FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config PATHS
$ENV{KDEDIR}/bin
/opt/kde3/bin
/opt/kde/bin
- NO_DEFAULT_PATH
)
-
- FIND_PROGRAM(KDECONFIG_EXECUTABLE kde-config)
-
-
SET(KDE3PREFIX)
IF(KDECONFIG_EXECUTABLE)
--- 104,116 ----
#SET(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
#now try to find some kde stuff
! FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config
! HINTS
$ENV{KDEDIR}/bin
+ PATHS
/opt/kde3/bin
/opt/kde/bin
)
SET(KDE3PREFIX)
IF(KDECONFIG_EXECUTABLE)
***************
*** 144,170 ****
# kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore
FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
$ENV{KDEDIR}/include
${KDE3PREFIX}/include
/opt/kde3/include
/opt/kde/include
/usr/include/kde
/usr/local/include/kde
- NO_DEFAULT_PATH
)
- FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h)
-
#now the KDE library directory
FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore
! PATHS
$ENV{KDEDIR}/lib
${KDE3PREFIX}/lib
/opt/kde3/lib
/opt/kde/lib
- NO_DEFAULT_PATH
)
- FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore)
-
SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY})
--- 132,155 ----
# kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore
FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
+ HINTS
$ENV{KDEDIR}/include
${KDE3PREFIX}/include
+ PATHS
/opt/kde3/include
/opt/kde/include
/usr/include/kde
/usr/local/include/kde
)
#now the KDE library directory
FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore
! HINTS
$ENV{KDEDIR}/lib
${KDE3PREFIX}/lib
+ PATHS
/opt/kde3/lib
/opt/kde/lib
)
SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY})
***************
*** 180,213 ****
#now search for the dcop utilities
! FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl PATHS
$ENV{KDEDIR}/bin
${KDE3PREFIX}/bin
/opt/kde3/bin
/opt/kde/bin
- NO_DEFAULT_PATH
)
! FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl)
!
! FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp PATHS
$ENV{KDEDIR}/bin
${KDE3PREFIX}/bin
/opt/kde3/bin
/opt/kde/bin
- NO_DEFAULT_PATH
)
! FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp)
!
! FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler PATHS
$ENV{KDEDIR}/bin
${KDE3PREFIX}/bin
/opt/kde3/bin
/opt/kde/bin
- NO_DEFAULT_PATH
)
- FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler)
-
# KDE3Macros.cmake contains all the KDE specific macros
INCLUDE(KDE3Macros)
--- 165,195 ----
#now search for the dcop utilities
! FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl
! HINTS
$ENV{KDEDIR}/bin
${KDE3PREFIX}/bin
+ PATHS
/opt/kde3/bin
/opt/kde/bin
)
! FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp
! HINTS
$ENV{KDEDIR}/bin
${KDE3PREFIX}/bin
+ PATHS
/opt/kde3/bin
/opt/kde/bin
)
! FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler
! HINTS
$ENV{KDEDIR}/bin
${KDE3PREFIX}/bin
+ PATHS
/opt/kde3/bin
/opt/kde/bin
)
# KDE3Macros.cmake contains all the KDE specific macros
INCLUDE(KDE3Macros)
Index: FindosgProducer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgProducer.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgProducer.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgProducer.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
! PATHS
$ENV{OSGPRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
! HINTS
$ENV{OSGPRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGPRODUCER_LIBRARY
NAMES osgProducer
! PATHS
$ENV{OSGPRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGPRODUCER_LIBRARY
! NAMES osgProducer
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGPRODUCER_LIBRARY
NAMES osgProducer
! HINTS
$ENV{OSGPRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindosgUtil.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgUtil.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgUtil.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgUtil.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
! PATHS
$ENV{OSGUTIL_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
! HINTS
$ENV{OSGUTIL_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGUTIL_LIBRARY
NAMES osgUtil
! PATHS
$ENV{OSGUTIL_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGUTIL_LIBRARY
! NAMES osgUtil
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGUTIL_LIBRARY
NAMES osgUtil
! HINTS
$ENV{OSGUTIL_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindosgViewer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgViewer.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgViewer.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgViewer.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
! PATHS
$ENV{OSGVIEWER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
! HINTS
$ENV{OSGVIEWER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGVIEWER_LIBRARY
NAMES osgViewer
! PATHS
$ENV{OSGVIEWER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGVIEWER_LIBRARY
! NAMES osgViewer
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGVIEWER_LIBRARY
NAMES osgViewer
! HINTS
$ENV{OSGVIEWER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindQuickTime.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQuickTime.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindQuickTime.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindQuickTime.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 18,35 ****
ELSE(APPLE)
FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
$ENV{QUICKTIME_DIR}/include
$ENV{QUICKTIME_DIR}
- NO_DEFAULT_PATH
)
-
- FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h)
-
FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
$ENV{QUICKTIME_DIR}/lib
$ENV{QUICKTIME_DIR}
- NO_DEFAULT_PATH
)
-
- FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
ENDIF(APPLE)
--- 18,30 ----
ELSE(APPLE)
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(APPLE)
Index: FindosgIntrospection.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgIntrospection.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgIntrospection.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgIntrospection.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
! PATHS
$ENV{OSGINTROSPECTION_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
! HINTS
$ENV{OSGINTROSPECTION_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGINTROSPECTION_LIBRARY
NAMES osgIntrospection
! PATHS
$ENV{OSGINTROSPECTION_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGINTROSPECTION_LIBRARY
! NAMES osgIntrospection
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGINTROSPECTION_LIBRARY
NAMES osgIntrospection
! HINTS
$ENV{OSGINTROSPECTION_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindPhysFS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPhysFS.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** FindPhysFS.cmake 16 Jan 2008 02:20:11 -0000 1.8
--- FindPhysFS.cmake 9 Jun 2008 20:04:05 -0000 1.9
***************
*** 12,22 ****
FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
! PATHS
$ENV{PHYSFSDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES include
! )
!
! FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
PATHS
~/Library/Frameworks
--- 12,18 ----
FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
! HINTS
$ENV{PHYSFSDIR}
! PATH_SUFFIXES include/physfs include
PATHS
~/Library/Frameworks
***************
*** 28,44 ****
/opt/csw # Blastwave
/opt
- PATH_SUFFIXES include/physfs include
)
FIND_LIBRARY(PHYSFS_LIBRARY
NAMES physfs
! PATHS
$ENV{PHYSFSDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(PHYSFS_LIBRARY
! NAMES physfs
PATHS
~/Library/Frameworks
--- 24,34 ----
/opt/csw # Blastwave
/opt
)
FIND_LIBRARY(PHYSFS_LIBRARY
NAMES physfs
! HINTS
$ENV{PHYSFSDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 50,54 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 40,43 ----
Index: FindosgFX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgFX.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgFX.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgFX.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
! PATHS
$ENV{OSGFX_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
! HINTS
$ENV{OSGFX_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGFX_LIBRARY
NAMES osgFX
! PATHS
$ENV{OSGFX_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGFX_LIBRARY
! NAMES osgFX
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGFX_LIBRARY
NAMES osgFX
! HINTS
$ENV{OSGFX_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindOpenAL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenAL.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** FindOpenAL.cmake 5 Mar 2008 08:11:15 -0000 1.10
--- FindOpenAL.cmake 9 Jun 2008 20:04:05 -0000 1.11
***************
*** 50,60 ****
FIND_PATH(OPENAL_INCLUDE_DIR al.h
! PATHS
$ENV{OPENALDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include/AL include/OpenAL include
- )
-
- FIND_PATH(OPENAL_INCLUDE_DIR al.h
PATHS
~/Library/Frameworks
--- 50,56 ----
FIND_PATH(OPENAL_INCLUDE_DIR al.h
! HINTS
$ENV{OPENALDIR}
PATH_SUFFIXES include/AL include/OpenAL include
PATHS
~/Library/Frameworks
***************
*** 67,83 ****
/opt
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
- PATH_SUFFIXES include/AL include/OpenAL include
)
FIND_LIBRARY(OPENAL_LIBRARY
NAMES OpenAL al openal OpenAL32
! PATHS
$ENV{OPENALDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
! )
!
! FIND_LIBRARY(OPENAL_LIBRARY
! NAMES OpenAL al openal OpenAL32
PATHS
~/Library/Frameworks
--- 63,73 ----
/opt
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
)
FIND_LIBRARY(OPENAL_LIBRARY
NAMES OpenAL al openal OpenAL32
! HINTS
$ENV{OPENALDIR}
! PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS
~/Library/Frameworks
***************
*** 90,94 ****
/opt
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
- PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
)
--- 80,83 ----
Index: FindGIF.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGIF.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** FindGIF.cmake 16 Jan 2008 02:20:11 -0000 1.3
--- FindGIF.cmake 9 Jun 2008 20:04:05 -0000 1.4
***************
*** 11,23 ****
FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
! PATHS
$ENV{GIF_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
-
-
- FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
PATHS
~/Library/Frameworks
--- 11,17 ----
FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
! HINTS
$ENV{GIF_DIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 33,46 ****
FIND_LIBRARY(GIF_LIBRARY
NAMES ${POTENTIAL_GIF_LIBS}
! PATHS
$ENV{GIF_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
- )
-
-
-
- FIND_LIBRARY(GIF_LIBRARY
- NAMES ${POTENTIAL_GIF_LIBS}
PATHS
~/Library/Frameworks
--- 27,33 ----
FIND_LIBRARY(GIF_LIBRARY
NAMES ${POTENTIAL_GIF_LIBS}
! HINTS
$ENV{GIF_DIR}
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 54,58 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
/usr/freeware
- PATH_SUFFIXES lib64 lib
)
--- 41,44 ----
Index: FindosgManipulator.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgManipulator.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgManipulator.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgManipulator.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
! PATHS
$ENV{OSGMANIPULATOR_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
! HINTS
$ENV{OSGMANIPULATOR_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGMANIPULATOR_LIBRARY
NAMES osgManipulator
! PATHS
$ENV{OSGMANIPULATOR_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGMANIPULATOR_LIBRARY
! NAMES osgManipulator
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGMANIPULATOR_LIBRARY
NAMES osgManipulator
! HINTS
$ENV{OSGMANIPULATOR_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindosgSim.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgSim.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindosgSim.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindosgSim.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 28,40 ****
# Try the user's environment request before anything else.
FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
! PATHS
$ENV{OSGSIM_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
PATHS
~/Library/Frameworks
--- 28,36 ----
# Try the user's environment request before anything else.
FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
! HINTS
$ENV{OSGSIM_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 48,66 ****
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGSIM_LIBRARY
NAMES osgSim
! PATHS
$ENV{OSGSIM_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(OSGSIM_LIBRARY
! NAMES osgSim
PATHS
~/Library/Frameworks
--- 44,56 ----
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
FIND_LIBRARY(OSGSIM_LIBRARY
NAMES osgSim
! HINTS
$ENV{OSGSIM_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 62,65 ----
Index: FindProducer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindProducer.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindProducer.cmake 16 Jan 2008 02:20:11 -0000 1.2
--- FindProducer.cmake 9 Jun 2008 20:04:06 -0000 1.3
***************
*** 31,43 ****
# Try the user's environment request before anything else.
FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
! PATHS
$ENV{PRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
- )
-
- FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
PATHS
~/Library/Frameworks
--- 31,39 ----
# 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}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
***************
*** 55,68 ****
FIND_LIBRARY(PRODUCER_LIBRARY
NAMES Producer
! PATHS
$ENV{PRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! NO_DEFAULT_PATH
! PATH_SUFFIXES lib64 lib
! )
!
! FIND_LIBRARY(PRODUCER_LIBRARY
! NAMES Producer
PATHS
/usr/local
--- 51,59 ----
FIND_LIBRARY(PRODUCER_LIBRARY
NAMES Producer
! HINTS
$ENV{PRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
PATHS
/usr/local
***************
*** 72,76 ****
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
--- 63,66 ----
Index: FindTCL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTCL.cmake,v
retrieving revision 1.54
retrieving revision 1.55
diff -C 2 -d -r1.54 -r1.55
*** FindTCL.cmake 13 Feb 2008 22:00:20 -0000 1.54
--- FindTCL.cmake 9 Jun 2008 20:04:06 -0000 1.55
***************
*** 175,194 ****
FIND_PATH(TCL_INCLUDE_PATH
NAMES tcl.h
! PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
! NO_DEFAULT_PATH
! )
! FIND_PATH(TCL_INCLUDE_PATH
! NAMES tcl.h
! PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
FIND_PATH(TK_INCLUDE_PATH
NAMES tk.h
! PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
! NO_DEFAULT_PATH
! )
! FIND_PATH(TK_INCLUDE_PATH
! NAMES tk.h
! PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
--- 175,184 ----
FIND_PATH(TCL_INCLUDE_PATH
NAMES tcl.h
! HINTS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
FIND_PATH(TK_INCLUDE_PATH
NAMES tk.h
! HINTS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
Index: FindQt3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt3.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** FindQt3.cmake 11 Jun 2007 19:02:03 -0000 1.16
--- FindQt3.cmake 9 Jun 2008 20:04:06 -0000 1.17
***************
*** 123,133 ****
FIND_PROGRAM(QT_MOC_EXECUTABLE
NAMES moc moc-qt3
! PATHS
$ENV{QTDIR}/bin
- NO_DEFAULT_PATH
- )
-
- FIND_PROGRAM(QT_MOC_EXECUTABLE
- NAMES moc moc-qt3
PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
--- 123,128 ----
FIND_PROGRAM(QT_MOC_EXECUTABLE
NAMES moc moc-qt3
! HINTS
$ENV{QTDIR}/bin
PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
***************
*** 151,163 ****
# qt 3 should prefer QTDIR over the PATH
FIND_PROGRAM(QT_UIC_EXECUTABLE uic
! PATHS
$ENV{QTDIR}/bin
! NO_DEFAULT_PATH
! )
! FIND_PROGRAM(QT_UIC_EXECUTABLE uic
"[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
--- 146,155 ----
# qt 3 should prefer QTDIR over the PATH
FIND_PROGRAM(QT_UIC_EXECUTABLE uic
! HINTS
$ENV{QTDIR}/bin
! 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
More information about the Cmake-commits
mailing list