bos #28928: Merge branch 'rnv/28928'

[modules/med.git] / src / MEDCalc / gui / CMakeLists.txt

diff --git a/src/MEDCalc/gui/CMakeLists.txt b/src/MEDCalc/gui/CMakeLists.txt
index b33ab4dfc4f1ec6b4472f79b10a1d852c9335e11..d597b9c42bae5f81a4a7bd9e4c5ed092ffe282ce 100644 (file)
--- a/src/MEDCalc/gui/CMakeLists.txt
+++ b/src/MEDCalc/gui/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2021  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,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF(SALOME_MED_WITH_QTTESTING)
+IF(SALOME_FIELDS_WITH_QTTESTING)
   ADD_DEFINITIONS(-DMED_HAS_QTTESTING)
 ENDIF()
 
@@ -27,6 +27,10 @@ INCLUDE(UseQtExt)
 
 ADD_SUBDIRECTORY(dialogs)
 
+IF(WIN32)
+ ADD_DEFINITIONS(-DNOMINMAX)
+ENDIF(WIN32)
+
 SET(MEDCALCGUI_SOURCES 
     DatasourceController.cxx
     factory.cxx
@@ -37,26 +41,52 @@ SET(MEDCALCGUI_SOURCES
     WorkspaceController.cxx
     XmedConsoleDriver.cxx
     XmedDataModel.cxx
+    MEDWidgetHelper.cxx
+    MEDWidgetHelperMeshView.cxx
+    MEDWidgetHelperComponent.cxx
+    MEDWidgetHelperContour.cxx
+    MEDWidgetHelperSlices.cxx
+    MEDWidgetHelperPlot3D.cxx
+    MEDWidgetHelperStreamLines.cxx
+    MEDWidgetHelperCutSegment.cxx
+    MEDWidgetHelperVectorField.cxx
+    MEDCALCGUI_Displayer.cxx
 )
 
-IF(SALOME_MED_WITH_QTTESTING)
+IF(SALOME_FIELDS_WITH_QTTESTING)
   LIST(APPEND MEDCALCGUI_SOURCES TestController.cxx)
 ENDIF()
 
-SET(MEDCALCGUI_HEADERS
+SET(MEDCALCGUI_MOC_HEADERS
   MEDModule.hxx
   MEDEventListener_i.hxx
   WorkspaceController.hxx
   DatasourceController.hxx
   PresentationController.hxx
   ProcessingController.hxx
+  MEDWidgetHelper.hxx
+  MEDWidgetHelperMeshView.hxx
+  MEDWidgetHelperComponent.hxx
+  MEDWidgetHelperScalarMap.hxx
+  MEDWidgetHelperContour.hxx
+  MEDWidgetHelperSlices.hxx
+  MEDWidgetHelperPointSprite.hxx
+  MEDWidgetHelperPlot3D.hxx
+  MEDWidgetHelperStreamLines.hxx
+  MEDWidgetHelperCutSegment.hxx
+  MEDWidgetHelperVectorField.hxx
+  MEDWidgetHelperDeflectionShape.hxx
+  )
+
+SET(MEDCALCGUI_HEADERS
+  MEDCALCGUI_Displayer.hxx
   )
  
-IF(SALOME_MED_WITH_QTTESTING)
-  LIST(APPEND MEDCALCGUI_HEADERS TestController.hxx)
+IF(SALOME_FIELDS_WITH_QTTESTING)
+  LIST(APPEND MEDCALCGUI_MOC_HEADERS TestController.hxx)
 ENDIF()
 
-QT_WRAP_MOC(MEDCALCGUI_HEADERS_MOC ${MEDCALCGUI_HEADERS})
+QT_WRAP_MOC(MEDCALCGUI_HEADERS_MOC ${MEDCALCGUI_MOC_HEADERS})
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
@@ -75,10 +105,10 @@ INCLUDE_DIRECTORIES(
 )
 
 SET(MEDCALCGUITS_SOURCES
-  MED_images.ts
-  MED_msg_en.ts
-  MED_msg_fr.ts
-  MED_msg_ja.ts
+  FIELDS_images.ts
+  FIELDS_msg_en.ts
+  FIELDS_msg_fr.ts
+  FIELDS_msg_ja.ts
   MEDCALC_msg_en.ts
   MEDCALC_msg_fr.ts
   MEDCALC_msg_ja.ts
@@ -91,6 +121,7 @@ SET(link_libraries
   SalomeIDLMED
   MEDCALCGUI_dialogs
   MEDFactoryEngine
+  FIELDSEngine
   ${GUI_qtx}
   ${GUI_suit}
   ${GUI_SalomeObject}
@@ -109,7 +140,7 @@ SET(link_libraries
   ${MEDCoupling_medcouplingremapper}
 )
 
-IF(SALOME_MED_WITH_QTTESTING)
+IF(SALOME_FIELDS_WITH_QTTESTING)
   LIST(APPEND link_libraries QtTesting)  # from ParaView
 ENDIF()
 
@@ -120,7 +151,7 @@ ENDIF(WITH_MEDMEMGUI)
 TARGET_LINK_LIBRARIES(MEDCALCGUI ${link_libraries})
 
 INSTALL(TARGETS MEDCALCGUI DESTINATION ${SALOME_INSTALL_LIBS})
-QT_INSTALL_TS_RESOURCES("${MEDCALCGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${MEDCALCGUITS_SOURCES}" "${SALOME_FIELDS_INSTALL_RES_DATA}")
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})