Show
Ignore:
Timestamp:
11/21/14 21:16:16 (34 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/examples/osgshadow/osgshadow.cpp

    r13099 r13107  
    837837    osg::ref_ptr<osgShadow::ShadowedScene> shadowedScene = new osgShadow::ShadowedScene; 
    838838 
    839     shadowedScene->getShadowSettings()->setReceivesShadowTraversalMask(ReceivesShadowTraversalMask); 
    840     shadowedScene->getShadowSettings()->setCastsShadowTraversalMask(CastsShadowTraversalMask); 
     839    osgShadow::ShadowSettings* settings = shadowedScene->getShadowSettings(); 
     840    settings->setReceivesShadowTraversalMask(ReceivesShadowTraversalMask); 
     841    settings->setCastsShadowTraversalMask(CastsShadowTraversalMask); 
    841842 
    842843    osg::ref_ptr<osgShadow::MinimalShadowMap> msm = NULL; 
     
    919920    else if( arguments.read("--vdsm") ) 
    920921    { 
    921         osgShadow::ShadowSettings* settings = new osgShadow::ShadowSettings; 
    922         shadowedScene->setShadowSettings(settings); 
    923  
    924922        while( arguments.read("--debugHUD") ) settings->setDebugDraw( true ); 
    925923        if (arguments.read("--persp")) settings->setShadowMapProjectionHint(osgShadow::ShadowSettings::PERSPECTIVE_SHADOW_MAP);