diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74c958725..78b429788 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
 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
@@ -340,13 +344,6 @@ IF(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)
 
 
 
diff --git a/src/osg/Config.in b/src/osg/Config.in
index 5881584f2..48cb92085 100644
--- a/src/osg/Config.in
+++ b/src/osg/Config.in
@@ -27,5 +27,6 @@
 #cmakedefine OSG_USE_FLOAT_PLANE
 #cmakedefine OSG_USE_FLOAT_BOUNDINGSPHERE
 #cmakedefine OSG_USE_FLOAT_BOUNDINGBOX
+#cmakedefine OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION
 
 #endif