Show
Ignore:
Timestamp:
10/21/14 17:10:27 (9 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/OpenThreads/qt/CMakeLists.txt

    r12540 r13482  
    4040ENDIF() 
    4141 
    42 TARGET_LINK_LIBRARIES(${LIB_NAME} ${QT_QTCORE_LIBRARY}) 
    43 INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) 
     42if ( QT4_FOUND ) 
     43    TARGET_LINK_LIBRARIES(${LIB_NAME} ${QT_QTCORE_LIBRARY}) 
     44    INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) 
     45else( QT4_FOUND ) 
     46IF ( Qt5Widgets_FOUND ) 
     47    qt5_use_modules( ${LIB_NAME} Core ) 
     48ENDIF ( Qt5Widgets_FOUND ) 
     49     
     50endif( QT4_FOUND ) 
    4451 
    4552# Since we're building different platforms binaries in