Show
Ignore:
Timestamp:
10/21/14 17:10:27 (10 days ago)
Author:
robert
Message:

Added shaders to support experimental shader based displacement mapping technique osgTerrain::ShaderTerrain?.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgQt/CMakeLists.txt

    r12292 r13482  
    1313) 
    1414 
    15 QT4_WRAP_CPP( SOURCES_H_MOC ${SOURCES_H} OPTIONS "-f" ) 
     15IF ( Qt5Widgets_FOUND ) 
     16    QT5_WRAP_CPP( SOURCES_H_MOC ${SOURCES_H} OPTIONS "-f" ) 
     17ELSE() 
     18    QT4_WRAP_CPP( SOURCES_H_MOC ${SOURCES_H} OPTIONS "-f" ) 
     19ENDIF() 
    1620 
    1721SET(TARGET_H 
     
    4852ENDIF() 
    4953 
    50 SET(TARGET_LIBRARIES 
     54# FIXME: This should work but something with the LINK_WITH_VARIABLES macro is not working 
     55#SET(TARGET_LIBRARIES_VARS 
     56#    QT_QTCORE_LIBRARY  
     57#    QT_QTGUI_LIBRARY 
     58#    QT_QTOPENGL_LIBRARY 
     59#) 
     60 
     61IF( QT4_FOUND ) 
     62    INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} 
     63             ${QT_QTOPENGL_INCLUDE_DIR} ) 
     64    SET(TARGET_LIBRARIES 
    5165    ${TARGET_LIBRARIES} 
    5266    ${QT_QTCORE_LIBRARY}  
     
    5569) 
    5670 
    57 # FIXME: This should work but something with the LINK_WITH_VARIABLES macro is not working 
    58 #SET(TARGET_LIBRARIES_VARS 
    59 #    QT_QTCORE_LIBRARY  
    60 #    QT_QTGUI_LIBRARY 
    61 #    QT_QTOPENGL_LIBRARY 
    62 #) 
    63 INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) 
     71ENDIF( QT4_FOUND ) 
    6472 
    6573SETUP_LIBRARY(${LIB_NAME}) 
    6674 
     75IF ( Qt5Widgets_FOUND ) 
     76    qt5_use_modules( ${LIB_NAME} Widgets OpenGL ) 
     77ENDIF ( Qt5Widgets_FOUND )