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

    r13041 r13557  
    77#include <map> 
    88#include <vector> 
     9 
     10 
     11 
    912#include <osg/Vec2> 
    1013#include <osg/Vec3> 
     
    1619#include <osg/Array> 
    1720#include <osg/Matrix> 
     21#include <osg/Image> 
    1822#include <osg/Geometry> 
    19 #include <osg/Image> 
    2023#include <osg/StateSet> 
    2124#include <osg/Uniform> 
     
    6972    osg::Matrixf readMatrixf(); 
    7073    osg::Matrixd readMatrixd(); 
    71     osg::Geometry::AttributeBinding readBinding(); 
     74    deprecated_osg::Geometry::AttributeBinding readBinding(); 
    7275    osg::Array* readArray(); 
    7376    osg::IntArray* readIntArray();