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

    r13473 r13482  
    207207    ENDIF() 
    208208 
    209     IF   (QT_FOUND AND NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE) 
    210  
    211         IF (QT_QTOPENGL_LIBRARY) 
     209    IF   ( (QT4_FOUND OR Qt5Widgets_FOUND) AND NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE) 
     210 
     211        IF ( QT4_FOUND OR Qt5Widgets_FOUND) 
    212212            ADD_SUBDIRECTORY(osgviewerQt) 
    213213            ADD_SUBDIRECTORY(osgqfont) 
    214214        ENDIF() 
    215215 
    216         IF (QT4_FOUND AND QT_QTWEBKIT_FOUND) 
     216        IF ( (QT4_FOUND AND QT_QTWEBKIT_FOUND) OR Qt5WebKitWidgets_FOUND ) 
    217217            ADD_SUBDIRECTORY(osgQtWidgets) 
    218218            ADD_SUBDIRECTORY(osgQtBrowser)