diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 15:42:34 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 15:42:34 -0400 |
| commit | c79dd4d951eec397692dd4af18e6a85b25a4f4ef (patch) | |
| tree | 8e7cbfd9c44e410b216b18fecf331c8d50cfa922 /Modules/FindOpenSceneGraph.cmake | |
| parent | 19e210af90d943548e7f07759030a2dd2cc8a2a4 (diff) | |
| parent | 4be6783711b2ff510c3449c5de22d35663d8bfc1 (diff) | |
| download | cmake-c79dd4d951eec397692dd4af18e6a85b25a4f4ef.tar.gz | |
Merge topic 'read-less-from-version-headers'
4be6783 read less from version headers into variables
Diffstat (limited to 'Modules/FindOpenSceneGraph.cmake')
| -rw-r--r-- | Modules/FindOpenSceneGraph.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindOpenSceneGraph.cmake b/Modules/FindOpenSceneGraph.cmake index 2e6774e083..1f30fe3f12 100644 --- a/Modules/FindOpenSceneGraph.cmake +++ b/Modules/FindOpenSceneGraph.cmake @@ -107,7 +107,8 @@ if(OSG_INCLUDE_DIR) endif() if(EXISTS "${_osg_Version_file}") - file(READ "${_osg_Version_file}" _osg_Version_contents) + file(STRINGS "${_osg_Version_file}" _osg_Version_contents + REGEX "#define (OSG_VERSION_[A-Z]+|OPENSCENEGRAPH_[A-Z]+_VERSION)[ \t]+[0-9]+") else() set(_osg_Version_contents "unknown") endif() @@ -134,6 +135,7 @@ if(OSG_INCLUDE_DIR) message(WARNING "[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] " "Failed to parse version number, please report this as a bug") endif() + unset(_osg_Version_contents) set(OPENSCENEGRAPH_VERSION "${_osg_VERSION_MAJOR}.${_osg_VERSION_MINOR}.${_osg_VERSION_PATCH}" CACHE INTERNAL "The version of OSG which was detected") |