Changeset 13467

Show
Ignore:
Timestamp:
11/21/14 21:16:16 (3 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/CMakeLists.txt

    r13459 r13467  
    3838SET(OPENSCENEGRAPH_MAJOR_VERSION 3) 
    3939SET(OPENSCENEGRAPH_MINOR_VERSION 1) 
    40 SET(OPENSCENEGRAPH_PATCH_VERSION 7) 
    41 SET(OPENSCENEGRAPH_SOVERSION 97) 
     40SET(OPENSCENEGRAPH_PATCH_VERSION 8) 
     41SET(OPENSCENEGRAPH_SOVERSION 98) 
    4242 
    4343# set to 0 when not a release candidate, non zero means that any generated 
  • OpenSceneGraph/trunk/include/osg/Version

    r13395 r13467  
    2121#define OPENSCENEGRAPH_MAJOR_VERSION    3 
    2222#define OPENSCENEGRAPH_MINOR_VERSION    1 
    23 #define OPENSCENEGRAPH_PATCH_VERSION    7 
    24 #define OPENSCENEGRAPH_SOVERSION        97 
     23#define OPENSCENEGRAPH_PATCH_VERSION    8 
     24#define OPENSCENEGRAPH_SOVERSION        98 
    2525 
    2626/* Convenience macro that can be used to decide whether a feature is present or not i.e.