Changeset 13430

Show
Ignore:
Timestamp:
11/21/14 21:16:16 (3 days 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.
"

Location:
OpenSceneGraph/trunk/src/osgViewer
Files:
2 modified

Legend:

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

    r13429 r13430  
    913913    if (_views.empty()) return; 
    914914 
    915 #if 1 
    916915    double cutOffTime = _frameStamp->getReferenceTime(); 
    917 #else     
    918     double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); 
    919 #endif 
    920916 
    921917    double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick()); 
  • OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

    r13429 r13430  
    827827    if (_done) return; 
    828828 
    829 #if 1 
    830829    double cutOffTime = _frameStamp->getReferenceTime(); 
    831 #else     
    832     double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); 
    833 #endif 
    834830     
    835831    double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick());