Show
Ignore:
Timestamp:
04/24/14 12:49:57 (3 hours ago)
Author:
robert
Message:

From Mattias Helsing, "Seems I was only half right given what you asked for. CMP0017 only
says that modules that are found and ran from cmake modules dir should
prefer cmake-provided modules. find_package() and include() still look
in CMAKE_MODULE_PATH first.

After some investigating I've come up with a proposal examplified in
the attached FindGDAL.cmake script. It simply calls the cmake provided
FindGDAL.cmake if it exists and returns if it succeeds in finding GDAL
using that, otherwise continue with our local cmake code.
Pro: Wont clutter our root CMakeLists.txt
Con: If we begin to write more advanced Findxxx modules (using
COMPONENTS, REQUIRED etc.) we may have to revise this scheme.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/examples/osgscalarbar/osgscalarbar.cpp

    r6941 r14047  
    7575#endif 
    7676 
    77 osg::Node* createScalarBar() 
     77osg::Node* createScalarBar(bool vertical) 
    7878{ 
    7979#if 1 
     
    9191 
    9292    ColorRange* cr = new ColorRange(0.0f,1.0f,cs); 
    93     ScalarBar* sb = new ScalarBar(20, 11, cr, "ScalarBar", ScalarBar::VERTICAL, 0.1f, new MyScalarPrinter); 
     93    ScalarBar* sb = new ScalarBar(20, 11, cr, 
     94                      vertical ? "Vertical" : "Horizontal", 
     95                      vertical ? ScalarBar::VERTICAL : ScalarBar::HORIZONTAL, 
     96                      0.1f, new MyScalarPrinter); 
    9497    sb->setScalarPrinter(new MyScalarPrinter); 
     98 
     99    if ( !vertical ) 
     100    { 
     101        sb->setPosition( osg::Vec3(0.5f,-0.5f,0)); 
     102    } 
    95103 
    96104    return sb; 
     
    138146 
    139147    osg::Group* group = new osg::Group; 
    140     group->addChild(createScalarBar()); 
     148    group->addChild(createScalarBar(true)); 
     149    group->addChild(createScalarBar(false)); 
    141150    group->addChild(createScalarBar_HUD()); 
    142151