Removed the optional build for osgWidget and plugins as these are options that are appropriate for building all the time

examples/CMakeLists.txt

@@ -114,6 +114,20 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osganimationskinning)
     ADD_SUBDIRECTORY(osganimationsolid)
     # ADD_SUBDIRECTORY(osganimationviewer)
+    ADD_SUBDIRECTORY(osgbrowser)
+    ADD_SUBDIRECTORY(osgwidgetaddremove)
+    ADD_SUBDIRECTORY(osgwidgetbox)
+    ADD_SUBDIRECTORY(osgwidgetcanvas)
+    ADD_SUBDIRECTORY(osgwidgetframe)
+    ADD_SUBDIRECTORY(osgwidgetinput)
+    ADD_SUBDIRECTORY(osgwidgetlabel)
+    ADD_SUBDIRECTORY(osgwidgetmenu)
+    ADD_SUBDIRECTORY(osgwidgetnotebook)
+    ADD_SUBDIRECTORY(osgwidgetscrolled)
+    ADD_SUBDIRECTORY(osgwidgetshader)
+    ADD_SUBDIRECTORY(osgwidgetstyled)
+    ADD_SUBDIRECTORY(osgwidgettable)
+    ADD_SUBDIRECTORY(osgwidgetwindow)
 
     IF   (POPPLER_FOUND AND CAIRO_FOUND)
         ADD_SUBDIRECTORY(osgpdf)
@@ -165,22 +179,6 @@ IF(DYNAMIC_OPENSCENEGRAPH)
         ADD_SUBDIRECTORY(osgviewerCocoa)
     ENDIF(APPLE)
 
-    IF   (BUILD_OSGWIDGET)
-        ADD_SUBDIRECTORY(osgbrowser)
-        ADD_SUBDIRECTORY(osgwidgetaddremove)
-        ADD_SUBDIRECTORY(osgwidgetbox)
-        ADD_SUBDIRECTORY(osgwidgetcanvas)
-        ADD_SUBDIRECTORY(osgwidgetframe)
-        ADD_SUBDIRECTORY(osgwidgetinput)
-        ADD_SUBDIRECTORY(osgwidgetlabel)
-        ADD_SUBDIRECTORY(osgwidgetmenu)
-        ADD_SUBDIRECTORY(osgwidgetnotebook)
-        ADD_SUBDIRECTORY(osgwidgetscrolled)
-        ADD_SUBDIRECTORY(osgwidgetshader)
-        ADD_SUBDIRECTORY(osgwidgetstyled)
-        ADD_SUBDIRECTORY(osgwidgettable)
-        ADD_SUBDIRECTORY(osgwidgetwindow)
-    ENDIF(BUILD_OSGWIDGET)
 
 
     IF   (LIBVNCSERVER_FOUND)

src/CMakeLists.txt

@@ -14,24 +14,15 @@ FOREACH( mylibfolder
         osgShadow
         osgSim
         osgTerrain
+        osgWidget
         osgVolume
+        osgPlugins
     )
 
     ADD_SUBDIRECTORY(${mylibfolder})
 
 ENDFOREACH( mylibfolder )
 
-OPTION(BUILD_OSGWIDGET "Enable to build osgWidget" ON)
-IF   (BUILD_OSGWIDGET)
-    ADD_SUBDIRECTORY(osgWidget)
-ENDIF(BUILD_OSGWIDGET)
-
-
-
-OPTION(BUILD_OSG_PLUGINS "Enable to build OSG Plugins" ON)
-IF   (BUILD_OSG_PLUGINS)
-    ADD_SUBDIRECTORY(osgPlugins)
-ENDIF(BUILD_OSG_PLUGINS)
 
 OPTION(BUILD_OSG_WRAPPERS "Enable to build Introspection and Wrappers" OFF)
 IF   (BUILD_OSG_WRAPPERS)

src/osgPlugins/CMakeLists.txt

@@ -41,6 +41,7 @@ ADD_SUBDIRECTORY(osgText)
 ADD_SUBDIRECTORY(osgViewer)
 ADD_SUBDIRECTORY(osgShadow)
 ADD_SUBDIRECTORY(osgTerrain)
+ADD_SUBDIRECTORY(osgWidget)
 ADD_SUBDIRECTORY(osga)
 ADD_SUBDIRECTORY(rot)
 ADD_SUBDIRECTORY(scale)
@@ -190,9 +191,6 @@ IF(RSVG_FOUND AND CAIRO_FOUND)
     ADD_SUBDIRECTORY(svg)
 ENDIF(RSVG_FOUND AND CAIRO_FOUND)
 
-IF   (BUILD_OSGWIDGET)
-    ADD_SUBDIRECTORY(osgWidget)
-ENDIF(BUILD_OSGWIDGET)
 
 IF   (LIBVNCSERVER_FOUND)
     ADD_SUBDIRECTORY(vnc)