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/osgPlugins/ive/DataInputStream.cpp

    r13506 r13557  
    585585 
    586586 
    587 osg::Geometry::AttributeBinding DataInputStream::readBinding(){ 
     587deprecated_osg::Geometry::AttributeBinding DataInputStream::readBinding(){ 
    588588    char c = readChar(); 
    589589 
     
    591591 
    592592    switch((int)c){ 
    593         case 0:    return osg::Geometry::BIND_OFF; 
    594         case 1: return osg::Geometry::BIND_OVERALL; 
    595         case 2: return static_cast<osg::Geometry::AttributeBinding>(3) /*osg::Geometry::BIND_PER_PRIMITIVE*/; 
    596         case 3: return osg::Geometry::BIND_PER_PRIMITIVE_SET; 
    597         case 4: return osg::Geometry::BIND_PER_VERTEX; 
     593        case 0:    return deprecated_osg::Geometry::BIND_OFF; 
     594        case 1: return deprecated_osg::Geometry::BIND_OVERALL; 
     595        case 2: return deprecated_osg::Geometry::BIND_PER_PRIMITIVE; 
     596        case 3: return deprecated_osg::Geometry::BIND_PER_PRIMITIVE_SET; 
     597        case 4: return deprecated_osg::Geometry::BIND_PER_VERTEX; 
    598598        default: 
    599599            throwException("Unknown binding type in DataInputStream::readBinding()"); 
    600             return osg::Geometry::BIND_OFF; 
     600            return deprecated_osg::Geometry::BIND_OFF; 
    601601    } 
    602602}