Changeset 13109

Show
Ignore:
Timestamp:
11/21/14 21:16:16 (2 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
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgShadow/ViewDependentShadowMap

    r13041 r13109  
    188188 
    189189        typedef std::vector< osg::ref_ptr<osg::Uniform> > Uniforms; 
     190        mutable OpenThreads::Mutex              _accessUnfiromsAndProgramMutex; 
    190191        Uniforms                                _uniforms; 
    191192        osg::ref_ptr<osg::Program>              _program; 
  • OpenSceneGraph/trunk/src/osgShadow/ViewDependentShadowMap.cpp

    r13108 r13109  
    11621162    unsigned int _baseTextureUnit = 0; 
    11631163 
     1164    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_accessUnfiromsAndProgramMutex); 
     1165 
    11641166    _shadowCastingStateSet = new osg::StateSet; 
    11651167 
     
    23432345    osg::ref_ptr<osg::StateSet> stateset = vdd.getStateSet(); 
    23442346 
     2347    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_accessUnfiromsAndProgramMutex); 
     2348     
    23452349    vdd.getStateSet()->clear(); 
    23462350