Index: OpenSceneGraph/trunk/examples/CMakeLists.txt
===================================================================
--- OpenSceneGraph/trunk/examples/CMakeLists.txt (revision 10717)
+++ OpenSceneGraph/trunk/examples/CMakeLists.txt (revision 10763)
@@ -59,5 +59,4 @@
     ADD_SUBDIRECTORY(osglogo)
     ADD_SUBDIRECTORY(osgmanipulator)
-    ADD_SUBDIRECTORY(osgmemorytest)
     ADD_SUBDIRECTORY(osgmovie)
     ADD_SUBDIRECTORY(osgmultiplerendertargets)
@@ -108,5 +107,4 @@
     ADD_SUBDIRECTORY(osgtexturecompression)
     ADD_SUBDIRECTORY(osgthirdpersonview)
-    ADD_SUBDIRECTORY(osgunittests)
     ADD_SUBDIRECTORY(osgvertexprogram)
     ADD_SUBDIRECTORY(osgvertexattributes)
@@ -138,14 +136,19 @@
     ADD_SUBDIRECTORY(osgwidgetwindow)
 
-IF(NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE)
-    ADD_SUBDIRECTORY(osgscreencapture)
-    ADD_SUBDIRECTORY(osgmotionblur)
-    ADD_SUBDIRECTORY(osgteapot)
-ENDIF()
-
-IF(OSG_GLU_AVAILABLE)
-    ADD_SUBDIRECTORY(osgphotoalbum)
-    ADD_SUBDIRECTORY(osgtessellate)
-ENDIF()
+    IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
+        ADD_SUBDIRECTORY(osgunittests)
+        ADD_SUBDIRECTORY(osgmemorytest)
+    ENDIF()
+
+    IF(NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE)
+        ADD_SUBDIRECTORY(osgscreencapture)
+        ADD_SUBDIRECTORY(osgmotionblur)
+        ADD_SUBDIRECTORY(osgteapot)
+    ENDIF()
+
+    IF(OSG_GLU_AVAILABLE)
+        ADD_SUBDIRECTORY(osgphotoalbum)
+        ADD_SUBDIRECTORY(osgtessellate)
+    ENDIF()
 
     ADD_SUBDIRECTORY(osgpdf)