From e484a6528c27ac43d77fccafc9263590503a79f7 Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Thu, 11 Aug 2016 18:12:05 +0200 Subject: [PATCH] Compilation ok for insitu component. TODO: deal with the conditional building of the insitu directory. --- CMakeLists.txt | 28 +++++++++++++++++++ resources/PARAVISCatalog.xml.in | 10 ++----- .../VisualizationComponent/CMakeLists.txt | 2 +- 3 files changed, 31 insertions(+), 9 deletions(-) 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 @@ field - -SALOME_MED/ParaMEDCouplingFieldDoubleCorbaInterface - + SALOME_MED/ParaMEDCouplingFieldDoubleCorbaInterface - - path_python_file - + path_python_file string - - 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) -- 2.30.2