Show
Ignore:
Timestamp:
07/23/14 18:36:17 (12 hours ago)
Author:
robert
Message:

Added VolumeSettings::Filename property.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/examples/osgviewerQt/CMakeLists.txt

    r12415 r13482  
    33) 
    44 
    5 IF( QT4_FOUND ) 
    6     SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE} ${QT_QTOPENGL_LIBRARY_RELEASE} ) 
     5IF ( NOT Qt5Widgets_FOUND ) 
     6    IF( QT4_FOUND ) 
     7    SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE} 
     8        ${QT_QTOPENGL_LIBRARY_RELEASE} ) 
    79    ADD_DEFINITIONS(-DUSE_QT4) 
    8 ELSE( QT4_FOUND ) 
     10    ELSE( QT4_FOUND ) 
    911    SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} ) 
    10 ENDIF( QT4_FOUND ) 
     12    ENDIF( QT4_FOUND ) 
    1113 
    12 INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ) 
     14    INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} 
     15             ${QT_QTOPENGL_INCLUDE_DIR} ) 
     16ENDIF() 
    1317 
    1418SET(TARGET_ADDED_LIBRARIES osgWidget osgQt) 
    1519 
    16 SETUP_EXAMPLE( osgviewerQt ) 
     20SET( EXAMPLE_NAME osgviewerQt ) 
     21 
     22SETUP_EXAMPLE( ${EXAMPLE_NAME} ) 
     23 
     24IF ( Qt5Widgets_FOUND ) 
     25    qt5_use_modules( example_${EXAMPLE_NAME} Widgets OpenGL ) 
     26ENDIF( Qt5Widgets_FOUND ) 
     27