Show
Ignore:
Timestamp:
04/24/14 12:49:57 (4 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/src/osgViewer/Viewer.cpp

    r13136 r13172  
    646646 
    647647 
     648    // get events from user Devices attached to Viewer. 
     649    for(Devices::iterator eitr = _eventSources.begin(); 
     650        eitr != _eventSources.end(); 
     651        ++eitr) 
     652    { 
     653        osgGA::Device* es = eitr->get(); 
     654        es->checkEvents(); 
     655 
     656        // open question, will we need to reproject mouse coordinates into current view's coordinate frame as is down for GraphicsWindow provided events? 
     657        // for now assume now and just get the events directly without any reprojection. 
     658        es->getEventQueue()->takeEvents(events, cutOffTime); 
     659    } 
     660 
     661    // get events from all windows attached to Viewer. 
    648662    for(Contexts::iterator citr = contexts.begin(); 
    649663        citr != contexts.end();