From ad0872a78376c7daac5d0592a52214cfddb1d0a7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 27 Jan 2012 09:49:06 +0000 Subject: [PATCH] From Kristofer Tingdahl, Added missing core OSG libraries. --- CMakeModules/FindOSG.cmake | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/CMakeModules/FindOSG.cmake b/CMakeModules/FindOSG.cmake index c82b51bae..27177b1e4 100644 --- a/CMakeModules/FindOSG.cmake +++ b/CMakeModules/FindOSG.cmake @@ -96,12 +96,17 @@ MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME) [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) - + IF( NOT ${MYLIBRARY}_DEBUG) IF(MYLIBRARY) SET(${MYLIBRARY}_DEBUG ${MYLIBRARY}) - ENDIF(MYLIBRARY) - ENDIF( NOT ${MYLIBRARY}_DEBUG) + ENDIF(MYLIBRARY) + ELSE() + IF( NOT MYLIBRARY ) + SET(${MYLIBRARY} ${${MYLIBRARY}_DEBUG} ) + ENDIF(NOT MYLIBRARY) + + ENDIF( NOT ${MYLIBRARY}_DEBUG ) ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME) @@ -111,12 +116,20 @@ FIND_OSG_LIBRARY(OSGUTIL_LIBRARY osgUtil) FIND_OSG_LIBRARY(OSGDB_LIBRARY osgDB) FIND_OSG_LIBRARY(OSGTEXT_LIBRARY osgText) FIND_OSG_LIBRARY(OSGWIDGET_LIBRARY osgWidget) +FIND_OSG_LIBRARY(OSGQT_LIBRARY osgQt) FIND_OSG_LIBRARY(OSGTERRAIN_LIBRARY osgTerrain) FIND_OSG_LIBRARY(OSGFX_LIBRARY osgFX) FIND_OSG_LIBRARY(OSGVIEWER_LIBRARY osgViewer) FIND_OSG_LIBRARY(OSGVOLUME_LIBRARY osgVolume) +FIND_OSG_LIBRARY(OSGMANIPULATOR_LIBRARY osgManipulator) +FIND_OSG_LIBRARY(OSGANIMATION_LIBRARY osgAnimation) +FIND_OSG_LIBRARY(OSGPARTICLE_LIBRARY osgParticle) +FIND_OSG_LIBRARY(OSGSHADOW_LIBRARY osgShadow) +FIND_OSG_LIBRARY(OSGPRESENTATION_LIBRARY osgPresentation) +FIND_OSG_LIBRARY(OSGSIM osgSim) FIND_OSG_LIBRARY(OPENTHREADS_LIBRARY OpenThreads) + SET(OSG_FOUND "NO") IF(OSG_LIBRARY AND OSG_INCLUDE_DIR) SET(OSG_FOUND "YES")