Changeset 8588

Show
Ignore:
Timestamp:
07/15/08 19:21:25
Author:
robert
Message:

From Jeremy Moles, import of the osgWidget NodeKit?, sourced from the original http://osgwidget.googlecode.com/svn/trunk

Notes from Robert Osfield, I've merged osgWidget trunk, and added/changed CMakeLists.txt file to make it suitable for inclusion in the core OSG, and moved imagery/scripts/shaders out into OpenSceneGraph-Data

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/examples/CMakeLists.txt

    r8487 r8588  
    150150    ENDIF(APPLE) 
    151151 
     152    IF   (BUILD_OSGWIDGET)) 
     153        ADD_SUBDIRECTORY(osgwidgetaddremove) 
     154        ADD_SUBDIRECTORY(osgwidgetbox) 
     155        ADD_SUBDIRECTORY(osgwidgetcanvas) 
     156        ADD_SUBDIRECTORY(osgwidgetframe) 
     157        ADD_SUBDIRECTORY(osgwidgetinput) 
     158        ADD_SUBDIRECTORY(osgwidgetlabel) 
     159        ADD_SUBDIRECTORY(osgwidgetmenu) 
     160        ADD_SUBDIRECTORY(osgwidgetnotebook) 
     161        ADD_SUBDIRECTORY(osgwidgetscrolled) 
     162        ADD_SUBDIRECTORY(osgwidgetshader) 
     163        ADD_SUBDIRECTORY(osgwidgetstyled) 
     164        ADD_SUBDIRECTORY(osgwidgettable) 
     165        ADD_SUBDIRECTORY(osgwidgetversion) 
     166        ADD_SUBDIRECTORY(osgwidgetwindow 
     167    ENDIF(BUILD_OSGWIDGET) 
     168 
     169 
    152170    #ADD_SUBDIRECTORY(osgcegui) 
    153171    #to add subject to find socket#ADD_SUBDIRECTORY(osgcluster) 

  • OpenSceneGraph/trunk/src/CMakeLists.txt

    r7673 r8588  
    11#the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs. 
    22FOREACH( mylibfolder  
    3   OpenThreads 
    4     osg 
    5     osgDB  
    6     osgUtil  
    7     osgGA  
    8     osgText  
    9     osgManipulator 
    10     osgSim 
    11     osgFX 
    12     osgParticle 
    13     osgShadow 
    14     osgTerrain 
    15     osgViewer 
    16 ) 
     3        OpenThreads 
     4        osg 
     5        osgDB  
     6        osgUtil  
     7        osgGA  
     8        osgText  
     9        osgManipulator 
     10        osgSim 
     11        osgFX 
     12        osgParticle 
     13        osgShadow 
     14        osgTerrain 
     15        osgViewer 
     16    ) 
     17 
    1718    ADD_SUBDIRECTORY(${mylibfolder}) 
    18 ENDFOREACH( mylibfolder    ) 
     19 
     20ENDFOREACH( mylibfolder ) 
     21 
     22OPTION(BUILD_OSGWIDGET "Enable to build osgWidget" ON) 
     23IF   (BUILD_OSGWIDGET) 
     24    ADD_SUBDIRECTORY(osgWidget) 
     25ENDIF(BUILD_OSGWIDGET) 
     26 
     27 
     28 
    1929OPTION(BUILD_OSG_PLUGINS "Enable to build OSG Plugins" ON) 
    2030IF   (BUILD_OSG_PLUGINS) 

  • OpenSceneGraph/trunk/src/osgPlugins/CMakeLists.txt

    r8358 r8588  
    167167ENDIF(RSVG_FOUND AND CAIRO_FOUND) 
    168168 
     169IF   (BUILD_OSGWIDGET) 
     170    ADD_SUBDIRECTORY(osgWidget) 
     171ENDIF(BUILD_OSGWIDGET) 
     172 
    169173 
    170174##########to get all the variables of Cmake