STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
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})
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_USE_GEOM_SOURCE "Import a GEOMETRY object to PARAVIS via its Corba IOR" ON )
-OPTION(SALOME_PARAVIS_USE_SMESH_SOURCE "Import a MESH object to PARAVIS via its Corba IOR" 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
"NOT SALOME_KERNEL_LIGHT_ONLY" ON)
-IF(SALOME_BUILD_TESTS)
- ENABLE_TESTING()
-ENDIF()
-
# Prerequisites
# =============
# Find "big" prerequisites first - they reference themselves many others
##
FIND_PACKAGE(SalomePython REQUIRED)
-FIND_PACKAGE(SalomeHDF5 REQUIRED)
-FIND_PACKAGE(SalomeSWIG REQUIRED)
IF(NOT SALOME_LIGHT_ONLY)
FIND_PACKAGE(SalomeOmniORB REQUIRED)
- FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
ENDIF()
IF(SALOME_BUILD_DOC)
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)
- SALOME_LOG_OPTIONAL_PACKAGE(MEDFile 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})
SET(SALOME_PARAVIS_USE_SMESH_SOURCE OFF)
ENDIF()
+IF(SALOME_BUILD_TESTS)
+ ENABLE_TESTING()
+ FIND_PACKAGE(SalomeCppUnit)
+ SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
+ENDIF()
+
## Detection summary:
SALOME_PACKAGE_REPORT_AND_CHECK()
# Sources
# ========
-IF(NOT SALOME_LIGHT_ONLY)
- ADD_SUBDIRECTORY(idl) # Order matters when using the wrapping - to be added AFTER src
-ENDIF()
-
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(adm_local)
ADD_SUBDIRECTORY(resources)
# List of targets in this project we want to make visible to the rest of the world.
# They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
IF(NOT SALOME_LIGHT_ONLY)
- SET(_${PROJECT_NAME}_exposed_targets SalomeIDLPVServer PARAVIS)
+ SET(_${PROJECT_NAME}_exposed_targets PARAVIS)
# Add all targets to the build-tree export set
EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
SET(MED_ROOT_DIR "${MED_ROOT_DIR}")
SET(MEDFILE_ROOT_DIR "${MEDFILE_ROOT_DIR}")
+SET(MEDCOUPLING_ROOT_DIR "${MEDCOUPLING_ROOT_DIR}")
SET(GEOM_ROOT_DIR "${GEOM_ROOT_DIR}")
SET(SMESH_ROOT_DIR "${SMESH_ROOT_DIR}")
${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
- KERNEL_ROOT_DIR GUI_ROOT_DIR MED_ROOT_DIR MEDFILE_ROOT_DIR GEOM_ROOT_DIR SMESH_ROOT_DIR)
+ KERNEL_ROOT_DIR GUI_ROOT_DIR MED_ROOT_DIR MEDFILE_ROOT_DIR MEDCOUPLING_ROOT_DIR GEOM_ROOT_DIR SMESH_ROOT_DIR)
# - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?):
# Get the relative path of the include directory so