X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPVGUI%2FCMakeLists.txt;h=a248fc05fb029afa185b995d497dbd8c5d9f0574;hb=35665aca0031dc689940d59cc17e148e6c61334b;hp=ae428bd933889dc1f3ef8d5d347d80ed3c98b079;hpb=38700ef6e95fe8e0812fd1e0c63844022889ed64;p=modules%2Fparavis.git

diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt
index ae428bd9..a248fc05 100644
--- a/src/PVGUI/CMakeLists.txt
+++ b/src/PVGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2022  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,44 +17,33 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 
-INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} 
+INCLUDE_DIRECTORIES(
     ${KERNEL_INCLUDE_DIRS}
-    ${GUI_INCLUDE_DIRS} 
-    ${PROJECT_BINARY_DIR}/idl 
+    ${GUI_INCLUDE_DIRS}  
     ${PROJECT_BINARY_DIR} 
-    ${CAS_INCLUDE_DIRS} 
     ${Boost_INCLUDE_DIRS}
     ${QT_INCLUDES}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/view
     ${CMAKE_CURRENT_BINARY_DIR}
     )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${CAS_DEFINITIONS})
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
 
 # libraries to link to
-SET(_PARAVIEW_APP_COMPO_LIB
-  pqApplicationComponents
-  )
 
 SET(_link_LIBRARIES 
-  ${OMNIORB_LIBRARIES}
   ${QT_LIBRARIES}
   ${PYTHON_LIBS}
-  ${KERNEL_LDFLAGS} ${KERNEL_SalomeDS}
-  ${GUI_LDFLAGS} ${GUI_SalomeApp} ${GUI_LightApp} ${GUI_CAM} ${GUI_qtx} ${GUI_suit}   
-                 ${GUI_SalomeObject} ${GUI_vtkTools}
-  ${MED_SalomeIDLMED}
-  ${_PARAVIEW_APP_COMPO_LIB}
+  ${KERNEL_LDFLAGS}
+  ${GUI_LDFLAGS} ${GUI_LightApp} ${GUI_CAM} ${GUI_qtx} ${GUI_suit}
+                 ${GUI_SalomeObject}
+  ParaView::pqApplicationComponents		 
   ${GUI_PVViewer}
-  SalomeIDLPVServer
 )
 
 # --- headers ---
@@ -63,7 +52,7 @@ SET(_ui_files
     resources/pqCustomSettingsWidget.ui
     )
 
-QT4_WRAP_UI(_ui_FORMS_HEADERS ${_ui_files})
+QT_WRAP_UIC(_ui_FORMS_HEADERS ${_ui_files})
 
 # header files / to be processed by moc
 SET(_moc_HEADERS
@@ -72,13 +61,8 @@ SET(_moc_HEADERS
   PVGUI_ParaViewSettingsPane.h
 )
 
-# header files / no moc processing
-SET(_other_HEADERS
-  PVGUI_Tools.h
-)
-
 # header files / to install
-SET(PVGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS} ${_ui_FORMS_HEADERS})
+SET(PVGUI_HEADERS ${_moc_HEADERS} ${_ui_FORMS_HEADERS})
 
 # --- resources ---
 
@@ -100,7 +84,7 @@ IF(SALOME_BUILD_DOC)
   # Check ParaView documentation file existence
   # if it exists add it to the resources (compile into binary form)
   # otherwise print warning message
-  SET(PV_DOC_FILE ${VTK_INSTALL_PREFIX}/share/doc/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}/paraview.qch)
+  SET(PV_DOC_FILE ${ParaView_PREFIX_PATH}/share/doc/ParaView/paraview.qch)
   IF (EXISTS ${PV_DOC_FILE})
     SET(RC_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/PVGUI.qrc.in)
     SET(RC_GENERATED ${CMAKE_CURRENT_BINARY_DIR}/PVGUI.qrc)
@@ -116,17 +100,16 @@ ENDIF()
 # --- sources ---
 
 # sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
   PVGUI_Module.cxx
   PVGUI_Module_actions.cxx
   PVGUI_Module_widgets.cxx
-  PVGUI_Tools.cxx
   PVGUI_ParaViewSettingsPane.cxx
   PVGUI_DataModel.cxx
   )
@@ -147,5 +130,5 @@ INSTALL(TARGETS PARAVIS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_I
 
 # --- header and resources installation ---
 INSTALL(FILES ${PVGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PARAVIS_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PARAVIS_INSTALL_RES_DATA}")
 INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_PARAVIS_INSTALL_RES_DATA})