Show
Ignore:
Timestamp:
11/21/14 21:16:16 (29 hours ago)
Author:
robert
Message:

From Alberto Luaces,"the current code uses the preprocessor for generating the plugin path in
a way that when CMAKE_INSTALL_PREFIX contains something along the lines
of

/usr/x86_64-linux-gnu/

it gets substituted as

/usr/x86_64-1-gnu/

that is, the string is preprocessed again, thereby making changes to
anything that matches any defined symbol, as "linux" in this example
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763816).

Quoting that path directly in CMake scripts solves that problem.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/View.cpp

    r13041 r13172  
    22182218 
    22192219 
     2220void View::addDevice(osgGA::Device* eventSource) 
     2221{ 
     2222    Devices::iterator itr = std::find( _eventSources.begin(), _eventSources.end(), eventSource ); 
     2223    if (itr==_eventSources.end()) 
     2224    { 
     2225        _eventSources.push_back(eventSource); 
     2226    } 
     2227} 
     2228 
     2229void View::removeDevice(osgGA::Device* eventSource) 
     2230{ 
     2231    Devices::iterator itr = std::find( _eventSources.begin(), _eventSources.end(), eventSource ); 
     2232    if (itr!=_eventSources.end()) 
     2233    { 
     2234        _eventSources.erase(itr); 
     2235    } 
     2236}