From: uhz Date: Mon, 12 Jun 2017 09:08:36 +0000 (+0200) Subject: PV 5.4 : Porting to OpenGL2 X-Git-Tag: V8_4_0a1~3^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4ab5dda497ba014354de12bc85562e314c73c62c;p=modules%2Fparavis.git PV 5.4 : Porting to OpenGL2 --- diff --git a/src/Plugins/MEDReader/IO/module.cmake b/src/Plugins/MEDReader/IO/module.cmake index 5363aad1..7ac6c484 100644 --- a/src/Plugins/MEDReader/IO/module.cmake +++ b/src/Plugins/MEDReader/IO/module.cmake @@ -7,6 +7,5 @@ vtk_module(vtkMEDReader vtkRenderingCore vtkTestingRendering vtkInteractionStyle - #vtkRenderingFreeTypeOpenGL EXCLUDE_FROM_WRAP_HIERARCHY ) diff --git a/src/Plugins/SimpleMode/IO/CMakeLists.txt b/src/Plugins/SimpleMode/IO/CMakeLists.txt index a33d5811..2bd884fe 100644 --- a/src/Plugins/SimpleMode/IO/CMakeLists.txt +++ b/src/Plugins/SimpleMode/IO/CMakeLists.txt @@ -19,5 +19,5 @@ # Author : Anthony Geay (EDF R&D) VTK_MODULE_LIBRARY(vtkSimpleMode vtkSimpleMode.cxx) -TARGET_LINK_LIBRARIES(vtkSimpleMode vtkPVVTKExtensionsRendering vtkFiltersGeneral vtkFiltersCore vtkRenderingOpenGL ${PARAVIEW_LIBRARIES}) +TARGET_LINK_LIBRARIES(vtkSimpleMode vtkPVVTKExtensionsRendering vtkFiltersGeneral vtkFiltersCore vtkRenderingOpenGL2 ${PARAVIEW_LIBRARIES}) INSTALL(TARGETS vtkSimpleMode RUNTIME DESTINATION lib/salome LIBRARY DESTINATION lib/salome ARCHIVE DESTINATION lib/salome) diff --git a/test/standalone/gui/CMakeLists.txt b/test/standalone/gui/CMakeLists.txt index e277b998..a0be3238 100644 --- a/test/standalone/gui/CMakeLists.txt +++ b/test/standalone/gui/CMakeLists.txt @@ -72,6 +72,6 @@ ADD_EXECUTABLE(paraLight ${pl_FORMS_HEADERS} ${rcs_sources}) -TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle)#vtkRenderingFreeTypeOpenGL) +TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle) #INSTALL(TARGET paraLight bin)