From: Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
Date: Thu, 11 Aug 2016 16:12:05 +0000 (+0200)
Subject: Compilation ok for insitu component.
X-Git-Tag: SHAPER_2.7.0~15^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e484a6528c27ac43d77fccafc9263590503a79f7;p=modules%2Fparavis.git

Compilation ok for insitu component.

TODO: deal with the conditional building of the insitu directory.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53ae344e..adc06fc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,6 +164,34 @@ IF(SALOME_PARAVIS_BUILD_PLUGINS)
     ENDIF()        
 ENDIF(SALOME_PARAVIS_BUILD_PLUGINS)
 
+#####################################
+# FIND MED
+#####################################
+SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CACHE PATH "Path to MED module")
+IF(EXISTS ${MED_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${MED_ROOT_DIR}/adm_local/cmake_files")
+  FIND_PACKAGE(SalomeMED REQUIRED)
+  ADD_DEFINITIONS(${MED_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${MED_INCLUDE_DIRS})
+ELSE(EXISTS ${MED_ROOT_DIR})
+  MESSAGE(FATAL_ERROR "We absolutely need MED module, please define MED_ROOT_DIR")
+ENDIF(EXISTS ${MED_ROOT_DIR})
+#####################################
+
+#####################################
+# FIND MEDCOUPLING
+#####################################
+SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR} CACHE PATH "Path to MEDCOUPLING module")
+IF(EXISTS ${MEDCOUPLING_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${MEDCOUPLING_ROOT_DIR}/cmake_files")
+  FIND_PACKAGE(SalomeMEDCoupling REQUIRED)
+  ADD_DEFINITIONS(${MEDCOUPLING_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${MEDCOUPLING_INCLUDE_DIRS})
+ELSE(EXISTS ${MEDCOUPLING_ROOT_DIR})
+  MESSAGE(FATAL_ERROR "We absolutely need MEDCOUPLING module, please define MEDCOUPLING_ROOT_DIR")
+ENDIF(EXISTS ${MEDCOUPLING_ROOT_DIR})
+#####################################
+
 ##
 ## From GEOM
 ##
diff --git a/resources/PARAVISCatalog.xml.in b/resources/PARAVISCatalog.xml.in
index c10b27ef..e827c058 100644
--- a/resources/PARAVISCatalog.xml.in
+++ b/resources/PARAVISCatalog.xml.in
@@ -88,22 +88,16 @@
                           <inParameter-list>
                               <inParameter>
                                 <inParameter-name>field</inParameter-name>
-                                <inParameter-type>
-SALOME_MED/ParaMEDCouplingFieldDoubleCorbaInterface
-                                </inParameter-type>
+                                <inParameter-type>SALOME_MED/ParaMEDCouplingFieldDoubleCorbaInterface</inParameter-type>
                             </inParameter>
                               <inParameter>
-                                <inParameter-name>
-                                  path_python_file
-                                </inParameter-name>
+                                <inParameter-name>path_python_file</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                             </inParameter>
                           </inParameter-list>
                           <outParameter-list>
-
                           </outParameter-list>
                           <DataStream-list>
-
                           </DataStream-list>
                       </component-service>
                   </component-service-list>
diff --git a/src/Insitu/VisualizationComponent/CMakeLists.txt b/src/Insitu/VisualizationComponent/CMakeLists.txt
index d3344fa0..2ccee2d6 100644
--- a/src/Insitu/VisualizationComponent/CMakeLists.txt
+++ b/src/Insitu/VisualizationComponent/CMakeLists.txt
@@ -15,7 +15,7 @@ ADD_DEFINITIONS(
 )
 
 # find additional libraries
-FIND_LIBRARY( _userlib_visulib visulib PATH /home/I35256/salome/install/V7_main_git/modules/install/PARAVIS_master/lib/salome)
+#FIND_LIBRARY( _userlib_visulib visulib PATH /home/I35256/salome/install/V7_main_git/modules/install/PARAVIS_master/lib/salome)
 #FIND_LIBRARY( _userlib_MEDLoaderForPV MEDLoaderForPV PATH /home/I35256/salome/install/V7_main_git/modules/install/PARAVIS_master/lib/salome)