[Cmake-commits] [cmake-commits] lowman committed FindOpenSceneGraph.cmake 1.6 1.7

[cmake-commits at cmake.org]

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

Modified Files:
	FindOpenSceneGraph.cmake 
Log Message:
Fixes version detection using osg/Version on Mac OSX when OSG is installed as a framework

Patch from rpavlik attached to issue #9714


Index: FindOpenSceneGraph.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenSceneGraph.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** FindOpenSceneGraph.cmake	16 Oct 2009 17:25:59 -0000	1.6
--- FindOpenSceneGraph.cmake	20 Oct 2009 11:55:48 -0000	1.7
***************
*** 97,102 ****
              "Detected OSG_INCLUDE_DIR = ${OSG_INCLUDE_DIR}")
      endif()
!     if(EXISTS "${OSG_INCLUDE_DIR}/osg/Version")
!       file(READ "${OSG_INCLUDE_DIR}/osg/Version" _osg_Version_contents)
      else()
        set(_osg_Version_contents "unknown")
--- 97,108 ----
              "Detected OSG_INCLUDE_DIR = ${OSG_INCLUDE_DIR}")
      endif()
!     
!     set(_osg_Version_file "${OSG_INCLUDE_DIR}/osg/Version")
!     if("${OSG_INCLUDE_DIR}" MATCHES "\\.framework$" AND NOT EXISTS "${_osg_Version_file}")
!         set(_osg_Version_file "${OSG_INCLUDE_DIR}/Headers/Version")
!     endif()
!     
!     if(EXISTS "${_osg_Version_file}")
!       file(READ "${_osg_Version_file}" _osg_Version_contents)
      else()
        set(_osg_Version_contents "unknown")