[EDF14077] : vtkLongArray are managed by MEDWriter

[modules/paravis.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index adc06fc3f8d6757863a401b7afd35cebf7ca5ee8..6f2bb590fdda4def8b1c0871d6b59326996bf07c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
@@ -144,7 +144,7 @@ FIND_PACKAGE(SalomeParaView REQUIRED)
 ##
 ## From MEDCoupling / MEDFile / or MEDModule (if CORBA plugin required):
 ##
-
+SET(SALOME_PARAVIS_BUILD_INSITU OFF)
 IF(SALOME_PARAVIS_BUILD_PLUGINS)
    # If CORBA plugins required, take in MED module 
    IF(SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
@@ -153,6 +153,9 @@ IF(SALOME_PARAVIS_BUILD_PLUGINS)
          LIST(APPEND CMAKE_MODULE_PATH "${MED_ROOT_DIR}/adm_local/cmake_files")
          FIND_PACKAGE(SalomeMED)
          SALOME_LOG_OPTIONAL_PACKAGE(SalomeMED SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
+         IF(SALOME_USE_MPI)
+           SET(SALOME_PARAVIS_BUILD_INSITU ON)
+         ENDIF(SALOME_USE_MPI)
       ENDIF()
     ELSE(SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
        SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR} CACHE PATH "Path to the MEDCoupling tool")
@@ -163,35 +166,6 @@ IF(SALOME_PARAVIS_BUILD_PLUGINS)
        SALOME_LOG_OPTIONAL_PACKAGE(MEDCoupling 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
 ##