Merge branch 'abn/port_pv42' into abn/rearch

[modules/paravis.git] / src / PVGUI / CMakeLists.txt

diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt
index cc6fcf1d775a35dbfbfb9cbf164191d5777a6c69..6614e038600e493cdf7542272290456e3b8e8142 100644 (file)
--- a/src/PVGUI/CMakeLists.txt
+++ b/src/PVGUI/CMakeLists.txt
@@ -30,9 +30,13 @@ INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
     ${QT_INCLUDES}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/view
     ${CMAKE_CURRENT_BINARY_DIR}
     )
 
+# Process viewer:
+ADD_SUBDIRECTORY(view)
+
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(${CAS_DEFINITIONS})
 ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
@@ -46,7 +50,7 @@ SET(_PARAVIEW_APP_COMPO_LIB
 SET(_link_LIBRARIES 
   ${OMNIORB_LIBRARIES}
   ${QT_LIBRARIES}
-  ${CAS_KERNEL}
+#  ${CAS_KERNEL}
   ${PYTHON_LIBS}
   ${KERNEL_LDFLAGS} ${KERNEL_SalomeDS} ${KERNEL_SALOMELocalTrace} ${KERNEL_SalomeIDLKernel} 
                     ${KERNEL_SalomeNS} ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SalomeContainer} ${KERNEL_TOOLSDS}
@@ -55,6 +59,7 @@ SET(_link_LIBRARIES
   ${MED_SalomeIDLMED}
   ${_PARAVIEW_APP_COMPO_LIB}
   SalomeIDLPARAVIS
+  PVViewer
 )
 
 # --- headers ---
@@ -68,23 +73,25 @@ QT4_WRAP_UI(_ui_FORMS_HEADERS ${_ui_files})
 # header files / to be processed by moc
 SET(_moc_HEADERS
   PVGUI_Module.h
-  PVGUI_ViewManager.h
-  PVGUI_ViewModel.h
-  PVGUI_ViewWindow.h
+#  PVGUI_ViewManager.h
+#  PVGUI_ViewModel.h
+#  PVGUI_ViewWindow.h
   PVGUI_ParaViewSettingsPane.h
 )
 
 # header files / no moc processing
 SET(_other_HEADERS
-  PVGUI_OutputWindowAdapter.h
+#  PVGUI_OutputWindowAdapter.h
   PVGUI_Tools.h
-  #PVGUI_MatplotlibMathTextUtilities.h
   PV_I.h
   PARAVIS_Gen_i.hh
   PV_Events.h
-  PV_Tools.h
 )
 
+IF(NOT SALOME_PARAVIS_MINIMAL_CORBA)
+    LIST(APPEND _other_HEADERS PV_Tools.h)
+ENDIF()
+
 # header files / to install
 SET(PVGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS} ${_ui_FORMS_HEADERS})
 
@@ -138,15 +145,8 @@ SET(_other_SOURCES
   PVGUI_Module.cxx
   PVGUI_Module_actions.cxx
   PVGUI_Module_widgets.cxx
-  PVGUI_ViewManager.cxx
-  PVGUI_ViewModel.cxx
-  PVGUI_ViewWindow.cxx
-  PVGUI_OutputWindowAdapter.cxx
   PVGUI_Tools.cxx
   PVGUI_ParaViewSettingsPane.cxx
-  #PVGUI_MatplotlibMathTextUtilities.cxx
-  PARAVIS_Gen_i.cc
-  PV_Tools.cxx
   )
 
 IF(NOT SALOME_PARAVIS_MINIMAL_CORBA)
@@ -162,6 +162,7 @@ IF(NOT SALOME_PARAVIS_MINIMAL_CORBA)
   SET(WRAP_IDL_I_CC "${WRAP_IDL_I_CC}" PARENT_SCOPE)
 
   SET(_VTK_wrap_SOURCES
+    PARAVIS_Gen_i.cc
     PARAVIS_CreateClass.cxx
     ${WRAP_IDL_I_CC}
   )