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/examples/osgQtWidgets/CMakeLists.txt

    r12292 r13482  
    88ENDIF() 
    99 
    10 SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY}) 
    11 INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) 
     10if ( QT4_FOUND ) 
     11    SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY}) 
     12    INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTWEBKIT_INCLUDE_DIR} ) 
     13endif( QT4_FOUND ) 
    1214 
    1315SET(TARGET_ADDED_LIBRARIES osgWidget osgQt) 
    1416 
    1517#### end var setup  ### 
    16 SETUP_EXAMPLE(osgQtWidgets) 
     18SET ( EXAMPLE_NAME osgQtWidgets ) 
     19SETUP_EXAMPLE(${EXAMPLE_NAME}) 
     20 
     21IF ( Qt5Widgets_FOUND ) 
     22    qt5_use_modules( example_${EXAMPLE_NAME} OpenGL WebKitWidgets ) 
     23ENDIF( Qt5Widgets_FOUND )