Changeset 13171

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.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/Uniform.cpp

    r13059 r13171  
    6060    OSG_DEBUG_FP<<"Uniform Adding parent"<<std::endl; 
    6161 
     62    OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex()); 
     63 
    6264    _parents.push_back(object); 
    6365} 
     
    6567void Uniform::removeParent(osg::StateSet* object) 
    6668{ 
     69    OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex()); 
     70 
    6771    ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),object); 
    6872    if (pitr!=_parents.end()) _parents.erase(pitr);