X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalc%2Fgui%2FCMakeLists.txt;h=1fcf79de22bde3f7653c8b08c53ae4a73670a0ed;hb=00da15b7d297827f6c0f4b2797ac8c79f20d9d0b;hp=aec534ad0befdbd6bf887a6670965bda05493373;hpb=fe98b71baffb76d2353d01b2a772b3cec24b1019;p=modules%2Fmed.git

diff --git a/src/MEDCalc/gui/CMakeLists.txt b/src/MEDCalc/gui/CMakeLists.txt
index aec534ad0..1fcf79de2 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,35 +17,75 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+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(UseQtExt)
 
 ADD_SUBDIRECTORY(dialogs)
 
+IF(WIN32)
+ ADD_DEFINITIONS(-DNOMINMAX)
+ENDIF(WIN32)
 
-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)
-QT_WRAP_MOC(MEDCALCGUI_HEADERS_MOC ${MEDCALCGUI_HEADERS})
+IF(SALOME_MED_WITH_QTTESTING)
+  LIST(APPEND MEDCALCGUI_SOURCES TestController.cxx)
+ENDIF()
 
+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
+  MEDWidgetHelperDeflectionShape.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}
   ${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
@@ -62,7 +102,7 @@ SET(MEDCALCGUITS_SOURCES
   MEDCALC_msg_ja.ts
 )
 
-SET(COMMON_FLAGS
+SET(link_libraries
   ${QT_MT_LIBRARIES}
   ${OMNIORB_LIBRARIES}
   ${PLATFORM_LIBRARIES}
@@ -87,11 +127,15 @@ SET(COMMON_FLAGS
   ${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})
 QT_INSTALL_TS_RESOURCES("${MEDCALCGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}")