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/include/osgQt/QWebViewImage

    r12139 r13482  
    1818#if !defined(OSGQT_LIBRARY) && !defined(OSG_LIBRARY_STATIC) 
    1919 
    20 #include <QtWebKit/QtWebKit> 
     20#if QT_VERSION >= 0x050000 
     21# include <QtWebKitWidgets> 
     22#else 
     23# include <QtWebKit> 
     24#endif 
     25 
    2126 
    2227#include <osgWidget/Browser>