PV 5.4 : Porting to OpenGL2

diff --git a/src/Plugins/MEDReader/IO/module.cmake b/src/Plugins/MEDReader/IO/module.cmake
index 5363aad1a3e1cb0c675cd84ec7ae464f422aaeab..7ac6c48415b95a91e19ac9b6a3e64d33b8975f97 100644 (file)
--- 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 a33d581150b99a74afd131ce81f7b1200823a9ab..2bd884fe913f18c669428056414fb9dfa76f4069 100644 (file)
--- 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 e277b998ac8c15317dfd9e5b2669911e59b4390d..a0be32385b977791ad977c0592b390d5c2f64cfe 100644 (file)
--- 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)