FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION definition into the Config.in rather use of -D define

Browse Source
This commit is contained in:
Robert Osfield 2008-10-03 15:36:34 +00:00
parent 3c52c2578f
commit 7c6dbe0ed8
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -263,6 +263,10 @@ MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGSPHERE)
OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float BoundingBox instead of double." ON) OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float BoundingBox instead of double." ON)
MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX) MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX)
#
# Enable workaround for OpenGL driver crash with occlusion query
#
OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<> T* operator() output conversion. " ON)
################################################################################ ################################################################################
# Set Config file # Set Config file
@ -340,13 +344,6 @@ IF(PKG_CONFIG_FOUND)
ENDIF(PKG_CONFIG_FOUND) ENDIF(PKG_CONFIG_FOUND)
#
# Enable workaround for OpenGL driver crash with occlusion query
#
OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<> T* operator() output conversion. " ON)
IF(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION)
ADD_DEFINITIONS(-DOSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION)
ENDIF(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION)

1
src/osg/Config.in
View File

@ -27,5 +27,6 @@
#cmakedefine OSG_USE_FLOAT_PLANE #cmakedefine OSG_USE_FLOAT_PLANE
#cmakedefine OSG_USE_FLOAT_BOUNDINGSPHERE #cmakedefine OSG_USE_FLOAT_BOUNDINGSPHERE
#cmakedefine OSG_USE_FLOAT_BOUNDINGBOX #cmakedefine OSG_USE_FLOAT_BOUNDINGBOX
#cmakedefine OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION
#endif #endif