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/include/osgDB/Serializer

    r13584 r13788  
    8383    } 
    8484 
     85    StringToValue& getStringToValue() { return _stringToValue; } 
     86    const StringToValue& getStringToValue() const { return _stringToValue; } 
     87 
     88    ValueToString& getValueToString() { return _valueToString; } 
     89    const ValueToString& getValueToString() const { return _valueToString; } 
     90 
    8591protected: 
    8692    StringToValue _stringToValue; 
     
    128134        RW_VEC2B, RW_VEC2UB, RW_VEC2S, RW_VEC2US, RW_VEC2I, RW_VEC2UI, 
    129135        RW_VEC3B, RW_VEC3UB, RW_VEC3S, RW_VEC3US, RW_VEC3I, RW_VEC3UI, 
    130         RW_VEC4B, RW_VEC4UB, RW_VEC4S, RW_VEC4US, RW_VEC4I, RE_VEC4UI 
     136        RW_VEC4B, RW_VEC4UB, RW_VEC4S, RW_VEC4US, RW_VEC4I, RW_VEC4UI 
    131137    }; 
    132138