From fe8da5a99f44a9d3a822e268f7bd2ef21fd491e6 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 16 Oct 2009 13:25:59 -0400 Subject: Try to fix bug#9714, should not crash when version file is not where it should be... --- Modules/FindOpenSceneGraph.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Modules/FindOpenSceneGraph.cmake b/Modules/FindOpenSceneGraph.cmake index 9a13ea2..b06cba4 100644 --- a/Modules/FindOpenSceneGraph.cmake +++ b/Modules/FindOpenSceneGraph.cmake @@ -96,13 +96,16 @@ if(OSG_INCLUDE_DIR) 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) + if(EXISTS "${OSG_INCLUDE_DIR}/osg/Version") + file(READ "${OSG_INCLUDE_DIR}/osg/Version" _osg_Version_contents) + else() + set(_osg_Version_contents "unknown") + endif() string(REGEX MATCH ".*#define OSG_VERSION_MAJOR[ \t]+[0-9]+.*" - _osg_old_defines ${_osg_Version_contents}) + _osg_old_defines "${_osg_Version_contents}") string(REGEX MATCH ".*#define OPENSCENEGRAPH_MAJOR_VERSION[ \t]+[0-9]+.*" - _osg_new_defines ${_osg_Version_contents}) + _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}) -- cgit v0.12