X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalc%2Fgui%2FCMakeLists.txt;h=f968a83811126e84c143e5409da79bb73c6d88dc;hb=a119debbdcf997724c31a9177793d2f9beef6a64;hp=4b5cad36d88e4c944b61bbb4e0dd27747e053c4d;hpb=10e479e70a8c12d2ed92af46375266826616cf2c;p=modules%2Fmed.git

diff --git a/src/MEDCalc/gui/CMakeLists.txt b/src/MEDCalc/gui/CMakeLists.txt
index 4b5cad36d..f968a8381 100644
--- a/src/MEDCalc/gui/CMakeLists.txt
+++ b/src/MEDCalc/gui/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2016  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,37 +17,70 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_DEFINITIONS(${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS})
-INCLUDE(${QT_USE_FILE})
+IF(SALOME_MED_WITH_QTTESTING)
+  ADD_DEFINITIONS(-DMED_HAS_QTTESTING)
+ENDIF()
+
+ADD_DEFINITIONS(${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 SET(QT_LIBS "${QT_LIBRARIES}")
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 ADD_SUBDIRECTORY(dialogs)
 
-
-SET(MEDCALCGUI_SOURCES
-  XmedConsoleDriver.cxx
-  WorkspaceController.cxx
-  XmedDataModel.cxx
-  MEDEventListener_i.cxx
-  MEDModule.cxx
-  DatasourceController.cxx
-  factory.cxx
+SET(MEDCALCGUI_SOURCES 
+    DatasourceController.cxx
+    factory.cxx
+    MEDEventListener_i.cxx
+    MEDModule.cxx
+    PresentationController.cxx
+    ProcessingController.cxx
+    WorkspaceController.cxx
+    XmedConsoleDriver.cxx
+    XmedDataModel.cxx
+    MEDWidgetHelper.cxx
+    MEDWidgetHelperMeshView.cxx
+    MEDWidgetHelperComponent.cxx
+    MEDWidgetHelperContour.cxx
+    MEDWidgetHelperSlices.cxx
 )
 
-SET(MEDCALCGUI_HEADERS MEDModule.hxx MEDEventListener_i.hxx WorkspaceController.hxx DatasourceController.hxx)
+IF(SALOME_MED_WITH_QTTESTING)
+  LIST(APPEND MEDCALCGUI_SOURCES TestController.cxx)
+ENDIF()
 
-QT4_WRAP_CPP(MEDCALCGUI_HEADERS_MOC ${MEDCALCGUI_HEADERS})
+SET(MEDCALCGUI_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
+  MEDWidgetHelperVectorField.hxx
+  )
+ 
+IF(SALOME_MED_WITH_QTTESTING)
+  LIST(APPEND MEDCALCGUI_HEADERS TestController.hxx)
+ENDIF()
+
+QT_WRAP_MOC(MEDCALCGUI_HEADERS_MOC ${MEDCALCGUI_HEADERS})
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${GUI_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
   ${CMAKE_CURRENT_BINARY_DIR}/dialogs
+  ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../cmp
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDGUI
   ${PROJECT_BINARY_DIR}/idl
@@ -64,12 +97,10 @@ SET(MEDCALCGUITS_SOURCES
   MEDCALC_msg_ja.ts
 )
 
-SET(COMMON_FLAGS
-  ${CAS_KERNEL}
+SET(link_libraries
   ${QT_MT_LIBRARIES}
   ${OMNIORB_LIBRARIES}
   ${PLATFORM_LIBRARIES}
-  ${BOOST_LIBRARIES}
   SalomeIDLMED
   MEDCALCGUI_dialogs
   MEDFactoryEngine
@@ -78,6 +109,7 @@ SET(COMMON_FLAGS
   ${GUI_SalomeObject}
   ${KERNEL_SalomeLifeCycleCORBA}
   ${KERNEL_SalomeKernelHelpers}
+  ${KERNEL_SalomeDS}
   ${GUI_SalomeApp}
   ${GUI_SalomeGuiHelpers}
   ${GUI_SalomeTreeData}
@@ -85,16 +117,23 @@ SET(COMMON_FLAGS
   ${GUI_CAM}
   ${GUI_LightApp}
   ${GUI_PyConsole}
+  ${MEDCoupling_medloader}
+  ${MEDCoupling_medcoupling}
+  ${MEDCoupling_medcouplingremapper}
 )
 
+IF(SALOME_MED_WITH_QTTESTING)
+  LIST(APPEND link_libraries QtTesting)  # from ParaView
+ENDIF()
+
 ADD_LIBRARY(MEDCALCGUI SHARED ${MEDCALCGUI_SOURCES} ${MEDCALCGUI_HEADERS_MOC})
 IF(WITH_MEDMEMGUI)
   SET_TARGET_PROPERTIES(MEDCALCGUI PROPERTIES COMPILE_FLAGS "-D__WITH_MEDMEMGUI__")
 ENDIF(WITH_MEDMEMGUI)
-TARGET_LINK_LIBRARIES(MEDCALCGUI ${COMMON_FLAGS})
+TARGET_LINK_LIBRARIES(MEDCALCGUI ${link_libraries})
 
 INSTALL(TARGETS MEDCALCGUI DESTINATION ${SALOME_INSTALL_LIBS})
-QT4_INSTALL_TS_RESOURCES("${MEDCALCGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${MEDCALCGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}")
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})