#18963 Minimize compiler warnings

[modules/geom.git] / src / VTKPlugin / CMakeLists.txt

diff --git a/src/VTKPlugin/CMakeLists.txt b/src/VTKPlugin/CMakeLists.txt
index d14424afe52bbc71a81218e7d15463dfb72e3ee3..a9df93bcfaa0049d4d6926fe6e0eca4ade99d67e 100644 (file)
--- a/src/VTKPlugin/CMakeLists.txt
+++ b/src/VTKPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2014-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,16 +18,14 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
-  ${VTK_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
   ${PROJECT_SOURCE_DIR}/src/GEOMAlgo
@@ -41,7 +39,6 @@ INCLUDE_DIRECTORIES(
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
-    ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/OBJECT
     ${PROJECT_SOURCE_DIR}/src/GEOMGUI
@@ -51,7 +48,7 @@ ENDIF()
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   )
    
@@ -67,14 +64,13 @@ ENDIF()
 
 # libraries to link to
 SET(_link_engine_LIBRARIES
-  ${CAS_TKVTK}
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_OpUtil}
   SalomeIDLGEOM
   SalomeIDLVTKPlugin
   GEOMEngine
   GEOMClient
-  vtkIOLegacy
+  VTK::IOLegacy
   OCC2VTK
   )
   
@@ -112,7 +108,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(VTKPluginGUI_SOURCES
     VTKPlugin_GUI.cxx
@@ -148,7 +144,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(VTKPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS VTKPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  QT4_INSTALL_TS_RESOURCES("${VTKPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${VTKPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
 ENDIF()