[Cmake-commits] [cmake-commits] hoffman committed FindDoxygen.cmake 1.14.12.2 1.14.12.3 FindGDAL.cmake 1.2.2.1 1.2.2.2 FindLua50.cmake 1.3.2.2 1.3.2.3 FindLua51.cmake 1.3.2.2 1.3.2.3 FindMPEG2.cmake 1.8 1.8.2.1 FindOpenSceneGraph.cmake NONE 1.2.2.2 FindOpenThreads.cmake 1.2.2.2 1.2.2.3 FindProducer.cmake 1.2.2.1 1.2.2.2 FindQt4.cmake 1.96.2.19 1.96.2.20 Findosg.cmake 1.2.2.2 1.2.2.3 FindosgAnimation.cmake 1.2.2.2 1.2.2.3 FindosgDB.cmake 1.2.2.2 1.2.2.3 FindosgFX.cmake 1.2.2.2 1.2.2.3 FindosgGA.cmake 1.2.2.2 1.2.2.3 FindosgIntrospection.cmake 1.2.2.2 1.2.2.3 FindosgManipulator.cmake 1.2.2.2 1.2.2.3 FindosgParticle.cmake 1.2.2.2 1.2.2.3 FindosgProducer.cmake 1.2.2.2 1.2.2.3 FindosgShadow.cmake 1.2.2.2 1.2.2.3 FindosgSim.cmake 1.2.2.2 1.2.2.3 FindosgTerrain.cmake 1.2.2.2 1.2.2.3 FindosgText.cmake 1.2.2.2 1.2.2.3 FindosgUtil.cmake 1.2.2.2 1.2.2.3 FindosgViewer.cmake 1.2.2.2 1.2.2.3 FindosgVolume.cmake 1.2.2.2 1.2.2.3 FindosgWidget.cmake 1.2.2.2 1.2.2.3 Findosg_functions.cmake 1.4.2.2 1.4.2.3

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Feb 4 17:04:51 EST 2009


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

Modified Files:
      Tag: CMake-2-6
	FindDoxygen.cmake FindGDAL.cmake FindLua50.cmake 
	FindLua51.cmake FindMPEG2.cmake FindOpenThreads.cmake 
	FindProducer.cmake FindQt4.cmake Findosg.cmake 
	FindosgAnimation.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 FindosgVolume.cmake FindosgWidget.cmake 
	Findosg_functions.cmake 
Added Files:
      Tag: CMake-2-6
	FindOpenSceneGraph.cmake 
Log Message:
ENH: merge in a few more changes for RC 11


Index: FindMPEG2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPEG2.cmake,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C 2 -d -r1.8 -r1.8.2.1
*** FindMPEG2.cmake	23 Jul 2007 13:49:52 -0000	1.8
--- FindMPEG2.cmake	4 Feb 2009 22:04:48 -0000	1.8.2.1
***************
*** 32,36 ****
    #some native mpeg2 installations will depend
    #on libSDL, if found, add it in.
!   INCLUDE( FindSDL.cmake )
    IF(SDL_FOUND)
      SET( MPEG2_LIBRARIES ${MPEG2_LIBRARIES} ${SDL_LIBRARY})
--- 32,36 ----
    #some native mpeg2 installations will depend
    #on libSDL, if found, add it in.
!   INCLUDE( FindSDL )
    IF(SDL_FOUND)
      SET( MPEG2_LIBRARIES ${MPEG2_LIBRARIES} ${SDL_LIBRARY})

Index: FindLua50.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLua50.cmake,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C 2 -d -r1.3.2.2 -r1.3.2.3
*** FindLua50.cmake	3 Sep 2008 13:43:16 -0000	1.3.2.2
--- FindLua50.cmake	4 Feb 2009 22:04:48 -0000	1.3.2.3
***************
*** 29,33 ****
  
  FIND_LIBRARY(LUA_LIBRARY_lua 
!   NAMES lua50 lua5.0 lua5 lua
    HINTS
    $ENV{LUA_DIR}
--- 29,33 ----
  
  FIND_LIBRARY(LUA_LIBRARY_lua 
!   NAMES lua50 lua5.0 lua-5.0 lua5 lua
    HINTS
    $ENV{LUA_DIR}

Index: FindosgFX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgFX.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgFX.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgFX.cmake	4 Feb 2009 22:04:48 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGFX DEFAULT_MSG
      OSGFX_LIBRARY OSGFX_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgFX DEFAULT_MSG
      OSGFX_LIBRARY OSGFX_INCLUDE_DIR)

Index: Findosg.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Findosg.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** Findosg.cmake	4 Feb 2009 16:44:12 -0000	1.2.2.2
--- Findosg.cmake	4 Feb 2009 22:04:48 -0000	1.2.2.3
***************
*** 1,2 ****
--- 1,6 ----
+ #
+ # NOTE: It is highly recommended that you use the new FindOpenSceneGraph.cmake
+ # introduced in CMake 2.6.3 and not use this Find module directly.
+ #
  # This is part of the Findosg* suite used to find OpenSceneGraph components.
  # Each component is separate and you must opt in to each module. You must 
***************
*** 35,37 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSG DEFAULT_MSG OSG_LIBRARY OSG_INCLUDE_DIR)
--- 39,41 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osg DEFAULT_MSG OSG_LIBRARY OSG_INCLUDE_DIR)

Index: FindosgGA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgGA.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgGA.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgGA.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGGA DEFAULT_MSG
      OSGGA_LIBRARY OSGGA_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgGA DEFAULT_MSG
      OSGGA_LIBRARY OSGGA_INCLUDE_DIR)

Index: FindLua51.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLua51.cmake,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C 2 -d -r1.3.2.2 -r1.3.2.3
*** FindLua51.cmake	3 Sep 2008 13:43:16 -0000	1.3.2.2
--- FindLua51.cmake	4 Feb 2009 22:04:48 -0000	1.3.2.3
***************
*** 29,33 ****
  
  FIND_LIBRARY(LUA_LIBRARY 
!   NAMES lua51 lua5.1 lua
    HINTS
    $ENV{LUA_DIR}
--- 29,33 ----
  
  FIND_LIBRARY(LUA_LIBRARY 
!   NAMES lua51 lua5.1 lua-5.1 lua
    HINTS
    $ENV{LUA_DIR}

Index: FindOpenThreads.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenThreads.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindOpenThreads.cmake	4 Feb 2009 16:44:02 -0000	1.2.2.2
--- FindOpenThreads.cmake	4 Feb 2009 22:04:48 -0000	1.2.2.3
***************
*** 41,63 ****
  find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
      HINTS
!     $ENV{OPENTHREADS_INCLUDE_DIR}
!     $ENV{OPENTHREADS_DIR}/include
!     $ENV{OPENTHREADS_DIR}
!     $ENV{OSG_INCLUDE_DIR}
!     $ENV{OSG_DIR}/include
!     $ENV{OSG_DIR}
!     $ENV{OSGDIR}/include
!     $ENV{OSGDIR}
      PATHS
!     ~/Library/Frameworks
!     /Library/Frameworks
!     /usr/local/include
!     /usr/include
!     /sw/include # Fink
!     /opt/local/include # DarwinPorts
!     /opt/csw/include # Blastwave
!     /opt/include
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
  )
  
--- 41,59 ----
  find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
      HINTS
!         # enough environment variables?
!         $ENV{OPENTHREADS_INCLUDE_DIR}
!         $ENV{OPENTHREADS_DIR}
!         $ENV{OSG_INCLUDE_DIR}
!         $ENV{OSG_DIR}
!         $ENV{OSGDIR}
!         $ENV{OpenThreads_ROOT}
!         $ENV{OSG_ROOT}
      PATHS
!         /sw # Fink
!         /opt/local # DarwinPorts
!         /opt/csw # Blastwave
!         /opt
!         /usr/freeware
!     PATH_SUFFIXES include
  )
  
***************
*** 66,97 ****
      NAMES OpenThreads OpenThreadsWin32 
      HINTS
!     $ENV{OPENTHREADS_LIBRARY_DIR}
!     $ENV{OPENTHREADS_DIR}/lib64
!     $ENV{OPENTHREADS_DIR}/lib
!     $ENV{OPENTHREADS_DIR}
!     $ENV{OSG_LIBRARY_DIR}
!     $ENV{OSG_DIR}/lib64
!     $ENV{OSG_DIR}/lib
!     $ENV{OSG_DIR}
!     $ENV{OSGDIR}/lib64
!     $ENV{OSGDIR}/lib
!     $ENV{OSGDIR}
      PATHS
!     ~/Library/Frameworks
!     /Library/Frameworks
!     /usr/local/lib64
!     /usr/local/lib
!     /usr/lib64
!     /usr/lib
!     /sw/lib64
!     /sw/lib
!     /opt/local/lib64
!     /opt/local/lib
!     /opt/csw/lib64
!     /opt/csw/lib
!     /opt/lib64
!     /opt/lib
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
  )
  
--- 62,79 ----
      NAMES OpenThreads OpenThreadsWin32 
      HINTS
!         $ENV{OPENTHREADS_LIBRARY_DIR}
!         $ENV{OPENTHREADS_DIR}
!         $ENV{OSG_LIBRARY_DIR}
!         $ENV{OSG_DIR}
!         $ENV{OSGDIR}
!         $ENV{OpenThreads_ROOT}
!         $ENV{OSG_ROOT}
      PATHS
!         /sw
!         /opt/local
!         /opt/csw
!         /opt
!         /usr/freeware
!     PATH_SUFFIXES lib64 lib
  )
  
***************
*** 99,129 ****
      NAMES OpenThreadsd OpenThreadsWin32d
      HINTS
!     $ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
!     $ENV{OPENTHREADS_LIBRARY_DIR}
!     $ENV{OPENTHREADS_DIR}/lib64
!     $ENV{OPENTHREADS_DIR}/lib
!     $ENV{OPENTHREADS_DIR}
!     $ENV{OSG_LIBRARY_DIR}
!     $ENV{OSG_DIR}/lib64
!     $ENV{OSG_DIR}/lib
!     $ENV{OSG_DIR}
!     $ENV{OSGDIR}/lib64
!     $ENV{OSGDIR}/lib
!     $ENV{OSGDIR}
      PATHS
!     /usr/local/lib64
!     /usr/local/lib
!     /usr/lib64
!     /usr/lib
!     /sw/lib64
!     /sw/lib
!     /opt/local/lib64
!     /opt/local/lib
!     /opt/csw/lib64
!     /opt/csw/lib
!     /opt/lib64
!     /opt/lib
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
  )
  
--- 81,99 ----
      NAMES OpenThreadsd OpenThreadsWin32d
      HINTS
!         $ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
!         $ENV{OPENTHREADS_LIBRARY_DIR}
!         $ENV{OPENTHREADS_DIR}
!         $ENV{OSG_LIBRARY_DIR}
!         $ENV{OSG_DIR}
!         $ENV{OSGDIR}
!         $ENV{OpenThreads_ROOT}
!         $ENV{OSG_ROOT}
      PATHS
!         /sw
!         /opt/local
!         /opt/csw
!         /opt
!         /usr/freeware
!     PATH_SUFFIXES lib64 lib
  )
  
***************
*** 133,141 ****
          debug ${OPENTHREADS_LIBRARY_DEBUG})
  else()
-     set(OPENTHREADS_LIBRARY_DEBUG ${OPENTHREADS_LIBRARY})
      set(OPENTHREADS_LIBRARIES ${OPENTHREADS_LIBRARY})
  endif()
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENTHREADS DEFAULT_MSG
      OPENTHREADS_LIBRARY OPENTHREADS_INCLUDE_DIR)
--- 103,110 ----
          debug ${OPENTHREADS_LIBRARY_DEBUG})
  else()
      set(OPENTHREADS_LIBRARIES ${OPENTHREADS_LIBRARY})
  endif()
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenThreads DEFAULT_MSG
      OPENTHREADS_LIBRARY OPENTHREADS_INCLUDE_DIR)

Index: FindosgShadow.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgShadow.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgShadow.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgShadow.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGSHADOW DEFAULT_MSG
      OSGSHADOW_LIBRARY OSGSHADOW_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgShadow DEFAULT_MSG
      OSGSHADOW_LIBRARY OSGSHADOW_INCLUDE_DIR)

Index: FindosgDB.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgDB.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgDB.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgDB.cmake	4 Feb 2009 22:04:48 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGDB DEFAULT_MSG
      OSGDB_LIBRARY OSGDB_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgDB DEFAULT_MSG
      OSGDB_LIBRARY OSGDB_INCLUDE_DIR)

Index: FindDoxygen.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDoxygen.cmake,v
retrieving revision 1.14.12.2
retrieving revision 1.14.12.3
diff -C 2 -d -r1.14.12.2 -r1.14.12.3
*** FindDoxygen.cmake	4 Feb 2009 16:44:01 -0000	1.14.12.2
--- FindDoxygen.cmake	4 Feb 2009 22:04:48 -0000	1.14.12.3
***************
*** 65,69 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(DOXYGEN DEFAULT_MSG DOXYGEN_EXECUTABLE)
  
  #
--- 65,69 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(Doxygen DEFAULT_MSG DOXYGEN_EXECUTABLE)
  
  #
***************
*** 86,93 ****
    )
    
-   include(FindPackageHandleStandardArgs)
-   FIND_PACKAGE_HANDLE_STANDARD_ARGS(DOXYGEN_DOT DEFAULT_MSG DOXYGEN_DOT_EXECUTABLE)
-   
    if(DOXYGEN_DOT_EXECUTABLE)
      # The Doxyfile wants the path to Dot, not the entire path and executable
      get_filename_component(DOXYGEN_DOT_PATH "${DOXYGEN_DOT_EXECUTABLE}" PATH CACHE)
--- 86,91 ----
    )
    
    if(DOXYGEN_DOT_EXECUTABLE)
+     set(DOXYGEN_DOT_FOUND TRUE)
      # The Doxyfile wants the path to Dot, not the entire path and executable
      get_filename_component(DOXYGEN_DOT_PATH "${DOXYGEN_DOT_EXECUTABLE}" PATH CACHE)

Index: FindGDAL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGDAL.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindGDAL.cmake	13 Jun 2008 12:55:15 -0000	1.2.2.1
--- FindGDAL.cmake	4 Feb 2009 22:04:48 -0000	1.2.2.2
***************
*** 1,7 ****
  # Locate gdal
! # This module defines
! # GDAL_LIBRARY
! # GDAL_FOUND, if false, do not try to link to gdal 
! # GDAL_INCLUDE_DIR, where to find the headers
  #
  # $GDALDIR is an environment variable that would
--- 1,13 ----
  # Locate gdal
! #
! # This module accepts the following environment variables:
! #
! #    GDAL_DIR or GDAL_ROOT - Specify the location of GDAL
! #
! # This module defines the following CMake variables:
! #
! #    GDAL_FOUND - True if libgdal is found
! #    GDAL_LIBRARY - A variable pointing to the GDAL library
! #    GDAL_INCLUDE_DIR - Where to find the headers
  #
  # $GDALDIR is an environment variable that would
***************
*** 18,60 ****
  
  # This makes the presumption that you are include gdal.h like
! # #include "gdal.h"
  
  FIND_PATH(GDAL_INCLUDE_DIR gdal.h
    HINTS
!   $ENV{GDAL_DIR}
!   PATH_SUFFIXES include
    PATHS
!   ~/Library/Frameworks/gdal.framework/Headers
!   /Library/Frameworks/gdal.framework/Headers
!   /usr/local/include/gdal
!   /usr/local/include/GDAL
!   /usr/local/include
!   /usr/include/gdal
!   /usr/include/GDAL
!   /usr/include
!   /sw/include/gdal 
!   /sw/include/GDAL 
!   /sw/include # Fink
!   /opt/local/include/gdal
!   /opt/local/include/GDAL
!   /opt/local/include # DarwinPorts
!   /opt/csw/include/gdal
!   /opt/csw/include/GDAL
!   /opt/csw/include # Blastwave
!   /opt/include/gdal
!   /opt/include/GDAL
!   /opt/include
  )
  
  FIND_LIBRARY(GDAL_LIBRARY 
!   NAMES gdal GDAL
    HINTS
!   $ENV{GDAL_DIR}
    PATH_SUFFIXES lib64 lib
    PATHS
-     ~/Library/Frameworks
-     /Library/Frameworks
-     /usr/local
-     /usr
      /sw
      /opt/local
--- 24,83 ----
  
  # This makes the presumption that you are include gdal.h like
! #
! #include "gdal.h"
  
  FIND_PATH(GDAL_INCLUDE_DIR gdal.h
    HINTS
!     $ENV{GDAL_DIR}
!     $ENV{GDAL_ROOT}
!   PATH_SUFFIXES
!      include/gdal
!      include/GDAL
!      include
    PATHS
!       ~/Library/Frameworks/gdal.framework/Headers
!       /Library/Frameworks/gdal.framework/Headers
!       /sw # Fink
!       /opt/local # DarwinPorts
!       /opt/csw # Blastwave
!       /opt
  )
  
+ IF(UNIX)
+     # Use gdal-config to obtain the library version (this should hopefully
+     # allow us to -lgdal1.x.y where x.y are correct version)
+     # For some reason, libgdal development packages do not contain
+     # libgdal.so...
+     FIND_PROGRAM(GDAL_CONFIG gdal-config
+         HINTS
+           $ENV{GDAL_DIR}
+           $ENV{GDAL_ROOT}
+         PATH_SUFFIXES bin
+         PATHS
+             /sw # Fink
+             /opt/local # DarwinPorts
+             /opt/csw # Blastwave
+             /opt
+     )
+ 
+     if(GDAL_CONFIG)
+         exec_program(${GDAL_CONFIG} ARGS --libs OUTPUT_VARIABLE GDAL_CONFIG_LIBS)
+         if(GDAL_CONFIG_LIBS)
+             string(REGEX MATCHALL "-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_LIBS})
+             string(REGEX REPLACE "-l" "" _gdal_lib "${_gdal_dashl}")
+             string(REGEX MATCHALL "-L[^ ]+" _gdal_dashL ${GDAL_CONFIG_LIBS})
+             string(REGEX REPLACE "-L" "" _gdal_libpath "${_gdal_dashL}")
+         endif()
+     endif()
+ endif()
+ 
  FIND_LIBRARY(GDAL_LIBRARY 
!   NAMES ${_gdal_lib} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
    HINTS
!      $ENV{GDAL_DIR}
!      $ENV{GDAL_ROOT}
!      ${_gdal_libpath}
    PATH_SUFFIXES lib64 lib
    PATHS
      /sw
      /opt/local
***************
*** 62,73 ****
      /opt
      /usr/freeware
-     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
  )
  
! SET(GDAL_FOUND "NO")
! IF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
!   SET(GDAL_FOUND "YES")
! ENDIF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
! 
! 
  
--- 85,93 ----
      /opt
      /usr/freeware
  )
  
! include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDAL DEFAULT_MSG GDAL_LIBRARY GDAL_INCLUDE_DIR)
  
+ set(GDAL_LIBRARIES ${GDAL_LIBRARY})
+ set(GDAL_INCLUDE_DIRS ${GDAL_INCLUDE_DIR})

Index: Findosg_functions.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Findosg_functions.cmake,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C 2 -d -r1.4.2.2 -r1.4.2.3
*** Findosg_functions.cmake	4 Feb 2009 16:44:16 -0000	1.4.2.2
--- Findosg_functions.cmake	4 Feb 2009 22:04:49 -0000	1.4.2.3
***************
*** 16,29 ****
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
         PATH_SUFFIXES include
         PATHS
-             ~/Library/Frameworks
-             /Library/Frameworks
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
!             [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
     )
  endfunction(OSG_FIND_PATH module header)
--- 16,27 ----
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
+             $ENV{OSG_ROOT}
         PATH_SUFFIXES include
         PATHS
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             /usr/freeware
     )
  endfunction(OSG_FIND_PATH module header)
***************
*** 42,56 ****
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
         PATH_SUFFIXES lib64 lib
         PATHS
-             ~/Library/Frameworks
-             /Library/Frameworks
-             /usr/local
-             /usr
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
     )
  
--- 40,51 ----
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
+             $ENV{OSG_ROOT}
         PATH_SUFFIXES lib64 lib
         PATHS
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             /usr/freeware
     )
  
***************
*** 61,75 ****
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
         PATH_SUFFIXES lib64 lib
         PATHS
-             ~/Library/Frameworks
-             /Library/Frameworks
-             /usr/local
-             /usr
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
      )
  
--- 56,67 ----
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
+             $ENV{OSG_ROOT}
         PATH_SUFFIXES lib64 lib
         PATHS
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             /usr/freeware
      )
  
***************
*** 86,90 ****
        )
     endif()
- 
- 
  endfunction(OSG_FIND_LIBRARY module library)
--- 78,91 ----
        )
     endif()
  endfunction(OSG_FIND_LIBRARY module library)
+ 
+ #
+ # OSG_MARK_AS_ADVANCED
+ # Just a convenience function for calling MARK_AS_ADVANCED
+ #
+ function(OSG_MARK_AS_ADVANCED _module)
+    string(TOUPPER ${_module} _module_UC)
+    mark_as_advanced(${_module_UC}_INCLUDE_DIR)
+    mark_as_advanced(${_module_UC}_LIBRARY)
+    mark_as_advanced(${_module_UC}_LIBRARY_DEBUG)
+ endfunction()

Index: FindProducer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindProducer.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindProducer.cmake	13 Jun 2008 12:55:15 -0000	1.2.2.1
--- FindProducer.cmake	4 Feb 2009 22:04:48 -0000	1.2.2.2
***************
*** 65,72 ****
  )
  
! SET(PRODUCER_FOUND "NO")
! IF(PRODUCER_LIBRARY AND PRODUCER_INCLUDE_DIR)
!   SET(PRODUCER_FOUND "YES")
! ENDIF(PRODUCER_LIBRARY AND PRODUCER_INCLUDE_DIR)
! 
! 
--- 65,69 ----
  )
  
! include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(Producer DEFAULT_MSG
!     PRODUCER_LIBRARY PRODUCER_INCLUDE_DIR)

Index: FindosgParticle.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgParticle.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgParticle.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgParticle.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGPARTICLE DEFAULT_MSG
      OSGPARTICLE_LIBRARY OSGPARTICLE_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgParticle DEFAULT_MSG
      OSGPARTICLE_LIBRARY OSGPARTICLE_INCLUDE_DIR)

Index: FindosgTerrain.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgTerrain.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgTerrain.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgTerrain.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGTERRAIN DEFAULT_MSG
      OSGTERRAIN_LIBRARY OSGTERRAIN_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgTerrain DEFAULT_MSG
      OSGTERRAIN_LIBRARY OSGTERRAIN_INCLUDE_DIR)

Index: FindosgText.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgText.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgText.cmake	4 Feb 2009 16:44:15 -0000	1.2.2.2
--- FindosgText.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGTEXT DEFAULT_MSG
      OSGTEXT_LIBRARY OSGTEXT_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgText DEFAULT_MSG
      OSGTEXT_LIBRARY OSGTEXT_INCLUDE_DIR)

Index: FindosgVolume.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgVolume.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgVolume.cmake	4 Feb 2009 16:44:16 -0000	1.2.2.2
--- FindosgVolume.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGVOLUME DEFAULT_MSG
      OSGVOLUME_LIBRARY OSGVOLUME_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgVolume DEFAULT_MSG
      OSGVOLUME_LIBRARY OSGVOLUME_INCLUDE_DIR)

Index: FindosgProducer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgProducer.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgProducer.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgProducer.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGPRODUCER DEFAULT_MSG
      OSGPRODUCER_LIBRARY OSGPRODUCER_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgProducer DEFAULT_MSG
      OSGPRODUCER_LIBRARY OSGPRODUCER_INCLUDE_DIR)

Index: FindosgUtil.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgUtil.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgUtil.cmake	4 Feb 2009 16:44:16 -0000	1.2.2.2
--- FindosgUtil.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGUTIL DEFAULT_MSG
      OSGUTIL_LIBRARY OSGUTIL_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgUtil DEFAULT_MSG
      OSGUTIL_LIBRARY OSGUTIL_INCLUDE_DIR)

--- NEW FILE: FindOpenSceneGraph.cmake ---
# - Find OpenSceneGraph
# This module searches for the OpenSceneGraph core "osg" library as well as
# OpenThreads, and whatever additional COMPONENTS that you specify.
#    See http://www.openscenegraph.org
#
# NOTE: If you would like to use this module in your CMAKE_MODULE_PATH instead
# of requiring CMake >= 2.6.3, you will also need to download
# FindOpenThreads.cmake, Findosg_functions.cmake, Findosg.cmake, as well as
# files for any Components you need to call (FindosgDB.cmake,
# FindosgUtil.cmake, etc.)
#
#==================================
#
# This module accepts the following variables (note mixed case)
#
#    OpenSceneGraph_DEBUG - Enable debugging output
#
#    OpenSceneGraph_MARK_AS_ADVANCED - Mark cache variables as advanced 
#                                      automatically
#
# The following environment variables are also respected for finding the OSG
# and it's various components.  CMAKE_PREFIX_PATH can also be used for this
# (see find_library() CMake documentation).
#
#    <MODULE>_DIR (where MODULE is of the form "OSGVOLUME" and there is a FindosgVolume.cmake file)
#    OSG_DIR
#    OSGDIR
#    OSG_ROOT
#
# This module defines the following output variables:
#
#    OPENSCENEGRAPH_FOUND - Was the OSG and all of the specified components found?
#
#    OPENSCENEGRAPH_VERSION - The version of the OSG which was found
#
#    OPENSCENEGRAPH_INCLUDE_DIRS - Where to find the headers
#
#    OPENSCENEGRAPH_LIBRARIES - The OSG libraries
#
#==================================
# Example Usage:
#
#  find_package(OpenSceneGraph 2.0.0 COMPONENTS osgDB osgUtil)
#  include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
#
#  add_executable(foo foo.cc)
#  target_link_libraries(foo ${OPENSCENEGRAPH_LIBRARIES})
#
#==================================
#
# Naming convention:
#  Local variables of the form _osg_foo
#  Input variables of the form OpenSceneGraph_FOO
#  Output variables of the form OPENSCENEGRAPH_FOO
#
# Copyright (c) 2009, Philip Lowman <philip at yhbt.com>
#
# Redistribution AND use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
#==================================

include(Findosg_functions)

set(_osg_modules_to_process)
foreach(_osg_component ${OpenSceneGraph_FIND_COMPONENTS})
    list(APPEND _osg_modules_to_process ${_osg_component})
endforeach()
list(APPEND _osg_modules_to_process "osg" "OpenThreads")
list(REMOVE_DUPLICATES _osg_modules_to_process)

if(OpenSceneGraph_DEBUG)
    message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
        "Components = ${_osg_modules_to_process}")
endif()

#
# First we need to find and parse osg/Version
#
OSG_FIND_PATH(OSG osg/Version)
if(OpenSceneGraph_MARK_AS_ADVANCED)
    OSG_MARK_AS_ADVANCED(OSG)
endif()

# Try to ascertain the version...
if(OSG_INCLUDE_DIR)
    if(OpenSceneGraph_DEBUG)
        message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
            "Detected OSG_INCLUDE_DIR = ${OSG_INCLUDE_DIR}")
    endif()

    file(READ "${OSG_INCLUDE_DIR}/osg/Version" _osg_Version_contents)

    string(REGEX MATCH ".*#define OSG_VERSION_MAJOR[ \t]+[0-9]+.*"
        _osg_old_defines ${_osg_Version_contents})
    string(REGEX MATCH ".*#define OPENSCENEGRAPH_MAJOR_VERSION[ \t]+[0-9]+.*"
        _osg_new_defines ${_osg_Version_contents})
    if(_osg_old_defines)
        string(REGEX REPLACE ".*#define OSG_VERSION_MAJOR[ \t]+([0-9]+).*"
            "\\1" _osg_VERSION_MAJOR ${_osg_Version_contents})
        string(REGEX REPLACE ".*#define OSG_VERSION_MINOR[ \t]+([0-9]+).*"
            "\\1" _osg_VERSION_MINOR ${_osg_Version_contents})
        string(REGEX REPLACE ".*#define OSG_VERSION_PATCH[ \t]+([0-9]+).*"
            "\\1" _osg_VERSION_PATCH ${_osg_Version_contents})
    elseif(_osg_new_defines)
        string(REGEX REPLACE ".*#define OPENSCENEGRAPH_MAJOR_VERSION[ \t]+([0-9]+).*"
            "\\1" _osg_VERSION_MAJOR ${_osg_Version_contents})
        string(REGEX REPLACE ".*#define OPENSCENEGRAPH_MINOR_VERSION[ \t]+([0-9]+).*"
            "\\1" _osg_VERSION_MINOR ${_osg_Version_contents})
        string(REGEX REPLACE ".*#define OPENSCENEGRAPH_PATCH_VERSION[ \t]+([0-9]+).*"
            "\\1" _osg_VERSION_PATCH ${_osg_Version_contents})
    else()
        message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
            "Failed to parse version number, please report this as a bug")
    endif()

    set(OPENSCENEGRAPH_VERSION "${_osg_VERSION_MAJOR}.${_osg_VERSION_MINOR}.${_osg_VERSION_PATCH}"
                                CACHE INTERNAL "The version of OSG which was detected")
    if(OpenSceneGraph_DEBUG)
        message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
            "Detected version ${OPENSCENEGRAPH_VERSION}")
    endif()
endif()

#
# Version checking
#
if(OpenSceneGraph_FIND_VERSION)
    if(OpenSceneGraph_FIND_VERSION_EXACT)
        if(NOT OPENSCENEGRAPH_VERSION VERSION_EQUAL ${OpenSceneGraph_FIND_VERSION})
            set(_osg_version_not_exact TRUE)
        endif()
    else()
        # version is too low
        if(NOT OPENSCENEGRAPH_VERSION VERSION_EQUAL ${OpenSceneGraph_FIND_VERSION} AND 
                NOT OPENSCENEGRAPH_VERSION VERSION_GREATER ${OpenSceneGraph_FIND_VERSION})
            set(_osg_version_not_high_enough TRUE)
        endif()
    endif()
endif()

set(_osg_required)
set(_osg_quiet)
if(OpenSceneGraph_FIND_REQUIRED)
    set(_osg_required "REQUIRED")
endif()
if(OpenSceneGraph_FIND_QUIETLY)
    set(_osg_quiet "QUIET")
endif()
#
# Here we call FIND_PACKAGE() on all of the components
#
foreach(_osg_module ${_osg_modules_to_process})
    if(OpenSceneGraph_DEBUG)
        message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
            "Calling find_package(${_osg_module} ${_osg_required} ${_osg_quiet})")
    endif()
    find_package(${_osg_module} ${_osg_required} ${_osg_quiet})

    string(TOUPPER ${_osg_module} _osg_module_UC)
    list(APPEND OPENSCENEGRAPH_INCLUDE_DIR ${${_osg_module_UC}_INCLUDE_DIR})
    list(APPEND OPENSCENEGRAPH_LIBRARIES ${${_osg_module_UC}_LIBRARIES})

    if(OpenSceneGraph_MARK_AS_ADVANCED)
        OSG_MARK_AS_ADVANCED(${_osg_module})
    endif()
endforeach()

if(OPENSCENEGRAPH_INCLUDE_DIR)
    list(REMOVE_DUPLICATES OPENSCENEGRAPH_INCLUDE_DIR)
endif()
        
#
# Inform the users with an error message based on
# what version they have vs. what version was
# required.
#
if(OpenSceneGraph_FIND_REQUIRED)
    set(_osg_version_output_type FATAL_ERROR)
else()
    set(_osg_version_output_type STATUS)
endif()
if(_osg_version_not_high_enough)
    set(_osg_EPIC_FAIL TRUE)
    if(NOT OpenSceneGraph_FIND_QUIETLY)
        message(${_osg_version_output_type}
            "ERROR: Version ${OpenSceneGraph_FIND_VERSION} or higher of the OSG "
            "is required.  Version ${OPENSCENEGRAPH_VERSION} was found.")
    endif()
elseif(_osg_version_not_exact)
    set(_osg_EPIC_FAIL TRUE)
    if(NOT OpenSceneGraph_FIND_QUIETLY)
        message(${_osg_version_output_type}
            "ERROR: Version ${OpenSceneGraph_FIND_VERSION} of the OSG is required "
            "(exactly), version ${OPENSCENEGRAPH_VERSION} was found.")
    endif()
else()
    # If the version was OK, we should hit this case where we can do the
    # typical user notifications
    include(FindPackageHandleStandardArgs)
    FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenSceneGraph DEFAULT_MSG OPENSCENEGRAPH_LIBRARIES OPENSCENEGRAPH_INCLUDE_DIR)
endif()

if(_osg_EPIC_FAIL)
    # Zero out everything, we didn't meet version requirements
    set(OPENSCENEGRAPH_FOUND FALSE)
    set(OPENSCENEGRAPH_LIBRARIES)
    set(OPENSCENEGRAPH_INCLUDE_DIR)
endif()

set(OPENSCENEGRAPH_INCLUDE_DIRS ${OPENSCENEGRAPH_INCLUDE_DIR})


Index: FindosgViewer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgViewer.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgViewer.cmake	4 Feb 2009 16:44:16 -0000	1.2.2.2
--- FindosgViewer.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGVIEWER DEFAULT_MSG
      OSGVIEWER_LIBRARY OSGVIEWER_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgViewer DEFAULT_MSG
      OSGVIEWER_LIBRARY OSGVIEWER_INCLUDE_DIR)

Index: FindosgIntrospection.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgIntrospection.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgIntrospection.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgIntrospection.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGINTROSPECTION DEFAULT_MSG
      OSGINTROSPECTION_LIBRARY OSGINTROSPECTION_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgIntrospection DEFAULT_MSG
      OSGINTROSPECTION_LIBRARY OSGINTROSPECTION_INCLUDE_DIR)

Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.19
retrieving revision 1.96.2.20
diff -C 2 -d -r1.96.2.19 -r1.96.2.20
*** FindQt4.cmake	4 Feb 2009 16:44:02 -0000	1.96.2.19
--- FindQt4.cmake	4 Feb 2009 22:04:48 -0000	1.96.2.20
***************
*** 1132,1136 ****
              GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH)
  
!             STRING(REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _match "${_contents}")
              IF(_match)
                 FOREACH (_current_MOC_INC ${_match})
--- 1132,1136 ----
              GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH)
  
!             STRING(REGEX MATCHALL "# *include +[^ ]+\\.moc[\">]" _match "${_contents}")
              IF(_match)
                 FOREACH (_current_MOC_INC ${_match})

Index: FindosgManipulator.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgManipulator.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgManipulator.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgManipulator.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGMANIPULATOR DEFAULT_MSG
      OSGMANIPULATOR_LIBRARY OSGMANIPULATOR_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgManipulator DEFAULT_MSG
      OSGMANIPULATOR_LIBRARY OSGMANIPULATOR_INCLUDE_DIR)

Index: FindosgSim.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgSim.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgSim.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgSim.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGSIM DEFAULT_MSG
      OSGSIM_LIBRARY OSGSIM_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgSim DEFAULT_MSG
      OSGSIM_LIBRARY OSGSIM_INCLUDE_DIR)

Index: FindosgWidget.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgWidget.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgWidget.cmake	4 Feb 2009 16:44:16 -0000	1.2.2.2
--- FindosgWidget.cmake	4 Feb 2009 22:04:49 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGWIDGET DEFAULT_MSG
      OSGWIDGET_LIBRARY OSGWIDGET_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgWidget DEFAULT_MSG
      OSGWIDGET_LIBRARY OSGWIDGET_INCLUDE_DIR)

Index: FindosgAnimation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgAnimation.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindosgAnimation.cmake	4 Feb 2009 16:44:13 -0000	1.2.2.2
--- FindosgAnimation.cmake	4 Feb 2009 22:04:48 -0000	1.2.2.3
***************
*** 35,38 ****
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGANIMATION DEFAULT_MSG
      OSGANIMATION_LIBRARY OSGANIMATION_INCLUDE_DIR)
--- 35,38 ----
  
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgAnimation DEFAULT_MSG
      OSGANIMATION_LIBRARY OSGANIMATION_INCLUDE_DIR)



More information about the Cmake-commits mailing list