Non regression test for bug ExtractCellType filter (PV Threshold filter)

[modules/paravis.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f2573389451f236fd5514a24c331551a5ce32ef..08be4910e682b5e5b8da89ff682f8d0f83b023d9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,7 @@ OPTION(SALOME_BUILD_DOC "Generate SALOME GUI documentation" ON)
 OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 OPTION(SALOME_PARAVIS_ALL_TEST "Add all tests for Salome PARAVIS module" OFF)
 OPTION(SALOME_PARAVIS_BUILD_PLUGINS "Build PARAVIS plugins (MEDReader, etc ...)" ON)
+OPTION(SALOME_PARAVIS_BUILD_CORBA_PLUGINS "Build PARAVIS CORBA plugins (ParaMEDCorba -- this requires the SALOME MED module)" ON)
 OPTION(SALOME_PARAVIS_USE_GEOM_SOURCE "Import a GEOMETRY object to PARAVIS via its Corba IOR" OFF)
 OPTION(SALOME_PARAVIS_USE_SMESH_SOURCE "Import a MESH object to PARAVIS via its Corba IOR" OFF)
 CMAKE_DEPENDENT_OPTION(SALOME_LIGHT_ONLY "Build SALOME Light only (no CORBA)" OFF
@@ -92,8 +93,6 @@ CMAKE_DEPENDENT_OPTION(SALOME_LIGHT_ONLY "Build SALOME Light only (no CORBA)" OF
 ##
 
 FIND_PACKAGE(SalomePython REQUIRED)
-FIND_PACKAGE(SalomeHDF5 REQUIRED)
-FIND_PACKAGE(SalomeSWIG REQUIRED)
 
 IF(NOT SALOME_LIGHT_ONLY)
   FIND_PACKAGE(SalomeOmniORB REQUIRED)
@@ -135,36 +134,30 @@ ADD_DEFINITIONS(${GUI_DEFINITIONS})
 INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
 
 ##
-## From GUI: part 2
-##
-FIND_PACKAGE(SalomeCAS REQUIRED)  # [ABN] I wish I could avoid that ...
-
-##
-## From MED
+## From MEDCoupling / MEDFile / or MEDModule (if CORBA plugin required):
 ##
 IF(SALOME_PARAVIS_BUILD_PLUGINS)
-  SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CACHE PATH "Path to the Salome MED module")
-  IF(EXISTS ${MED_ROOT_DIR})
-    LIST(APPEND CMAKE_MODULE_PATH "${MED_ROOT_DIR}/adm_local/cmake_files")
-    FIND_PACKAGE(SalomeMED REQUIRED)
-  ELSE()
-    MESSAGE(FATAL_ERROR "We absolutely need the Salome MED module to build plugins, please define MED_ROOT_DIR")
-  ENDIF()
-  IF(SALOME_MED_STANDALONE OR SALOME_MED_MICROMED)
-    MESSAGE(FATAL_ERROR "We absolutely need a Salome MED with KERNEL and with MED file dependancy,
-                         please set SALOME_MED_STANDALONE=OFF and SALOME_MED_MICROMED=OFF in MED module
-                         or SALOME_PARAVIS_BUILD_PLUGINS=OFF in PARAVIS module")
-  ENDIF()
-  FIND_PACKAGE(SalomeMEDFile)
-  FIND_PACKAGE(MEDCoupling)
-  SALOME_LOG_OPTIONAL_PACKAGE(MEDFile SALOME_PARAVIS_BUILD_PLUGINS)
-  SALOME_LOG_OPTIONAL_PACKAGE(MEDCoupling SALOME_PARAVIS_BUILD_PLUGINS)
-ENDIF()
+   # If CORBA plugins required, take in MED module 
+   IF(SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
+      SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CACHE PATH "Path to the SALOME MED module")
+      IF(EXISTS ${MED_ROOT_DIR})
+         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)
+      ENDIF()
+    ELSE(SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
+       SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR} CACHE PATH "Path to the MEDCoupling tool")
+       IF(EXISTS ${MEDCOUPLING_ROOT_DIR})
+          LIST(APPEND CMAKE_MODULE_PATH "${MEDCOUPLING_ROOT_DIR}/cmake_files")   
+       ENDIF()
+       FIND_PACKAGE(SalomeMEDCoupling)            # will load MEDFile
+       SALOME_LOG_OPTIONAL_PACKAGE(MEDCoupling SALOME_PARAVIS_BUILD_PLUGINS)
+    ENDIF()        
+ENDIF(SALOME_PARAVIS_BUILD_PLUGINS)
 
 ##
 ## From GEOM
 ##
-
 IF(SALOME_PARAVIS_BUILD_PLUGINS AND SALOME_PARAVIS_USE_GEOM_SOURCE)
   SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
   IF(EXISTS ${GEOM_ROOT_DIR})