# Project name, upper case
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
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})
# User options
# ============
INCLUDE(CMakeDependentOption)
-OPTION(MEDCOUPLING_MED_MICROMED "Build MED without MED file dependancy." OFF)
-OPTION(MEDCOUPLING_MED_ENABLE_PYTHON "Build PYTHON bindings." ON)
-OPTION(MEDCOUPLING_MED_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
-OPTION(MEDCOUPLING_MED_ENABLE_RENUMBER "Build Renumber." ON)
-OPTION(MEDCOUPLING_MED_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON)
+OPTION(MEDCOUPLING_MICROMED "Build MED without MED file dependancy." OFF)
+OPTION(MEDCOUPLING_ENABLE_PYTHON "Build PYTHON bindings." ON)
+OPTION(MEDCOUPLING_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
+OPTION(MEDCOUPLING_ENABLE_RENUMBER "Build Renumber." ON)
+OPTION(MEDCOUPLING_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON)
OPTION(MEDCOUPLING_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." OFF)
OPTION(MEDCOUPLING_BUILD_TESTS "Build MED tests." ON)
OPTION(MEDCOUPLING_BUILD_DOC "Build MED doc." ON)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "MEDCOUPLING_MED_ENABLE_PARTITIONER" OFF)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "MEDCOUPLING_MED_ENABLE_PARTITIONER;NOT MEDCOUPLING_USE_MPI" OFF)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "MEDCOUPLING_MED_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "MEDCOUPLING_ENABLE_PARTITIONER" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "MEDCOUPLING_ENABLE_PARTITIONER;NOT MEDCOUPLING_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "MEDCOUPLING_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
IF(WIN32)
- CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_MEDLOADER_USE_XDR "Enable use of XDR for SauvReader." ON "NOT MEDCOUPLING_MED_MICROMED" OFF)
+ CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MEDLOADER_USE_XDR "Enable use of XDR for SauvReader." ON "NOT MEDCOUPLING_MICROMED" OFF)
ENDIF(WIN32)
#
# Set list of prerequisites
# =========================
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
FIND_PACKAGE(SalomeHDF5 REQUIRED)
FIND_PACKAGE(SalomeMEDFile REQUIRED)
# XDR stuff
IF(NOT WIN32)
FIND_PACKAGE(SalomeXDR REQUIRED)
ELSE(NOT WIN32)
- IF(MEDCOUPLING_MED_MEDLOADER_USE_XDR)
+ IF(MEDCOUPLING_MEDLOADER_USE_XDR)
FIND_PACKAGE(SalomeXDR REQUIRED)
- ENDIF(MEDCOUPLING_MED_MEDLOADER_USE_XDR)
+ ENDIF(MEDCOUPLING_MEDLOADER_USE_XDR)
ENDIF(NOT WIN32)
# End of XDR Stuff
- IF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
+ IF(MEDCOUPLING_ENABLE_PARTITIONER)
FIND_PACKAGE(SalomeLibXml2)
- SALOME_LOG_OPTIONAL_PACKAGE(LibXml2 MEDCOUPLING_MED_ENABLE_PARTITIONER)
- IF(MEDCOUPLING_MED_PARTITIONER_METIS)
+ SALOME_LOG_OPTIONAL_PACKAGE(LibXml2 MEDCOUPLING_ENABLE_PARTITIONER)
+ IF(MEDCOUPLING_PARTITIONER_METIS)
FIND_PACKAGE(SalomeMetis)
- SALOME_LOG_OPTIONAL_PACKAGE(Metis MEDCOUPLING_MED_PARTITIONER_METIS)
+ SALOME_LOG_OPTIONAL_PACKAGE(Metis MEDCOUPLING_PARTITIONER_METIS)
ADD_DEFINITIONS("-DMED_ENABLE_METIS")
- ENDIF(MEDCOUPLING_MED_PARTITIONER_METIS)
- IF(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
+ ENDIF(MEDCOUPLING_PARTITIONER_METIS)
+ IF(MEDCOUPLING_PARTITIONER_SCOTCH)
FIND_PACKAGE(SalomeScotch)
- SALOME_LOG_OPTIONAL_PACKAGE(Scotch MEDCOUPLING_MED_PARTITIONER_SCOTCH)
+ SALOME_LOG_OPTIONAL_PACKAGE(Scotch MEDCOUPLING_PARTITIONER_SCOTCH)
ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH")
- ENDIF(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
- ENDIF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+ ENDIF(MEDCOUPLING_PARTITIONER_SCOTCH)
+ ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
+ENDIF(NOT MEDCOUPLING_MICROMED)
ENABLE_TESTING() # let it outsite because even if MEDCOUPLING_BUILD_TESTS is OFF, python tests that not need additional compilation can be run.
IF(MEDCOUPLING_USE_MPI)
FIND_PACKAGE(SalomeMPI REQUIRED)
ADD_DEFINITIONS("-DHAVE_MPI")
- IF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+ IF(MEDCOUPLING_PARTITIONER_PARMETIS)
FIND_PACKAGE(SalomeParMetis)
- SALOME_LOG_OPTIONAL_PACKAGE(ParMetis MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+ SALOME_LOG_OPTIONAL_PACKAGE(ParMetis MEDCOUPLING_PARTITIONER_PARMETIS)
ADD_DEFINITIONS("-DMED_ENABLE_PARMETIS")
- ENDIF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+ ENDIF(MEDCOUPLING_PARTITIONER_PARMETIS)
ENDIF(MEDCOUPLING_USE_MPI)
-IF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+IF(MEDCOUPLING_ENABLE_RENUMBER)
FIND_PACKAGE(SalomeBoost)
- SALOME_LOG_OPTIONAL_PACKAGE(Boost MEDCOUPLING_MED_ENABLE_RENUMBER)
-ENDIF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+ SALOME_LOG_OPTIONAL_PACKAGE(Boost MEDCOUPLING_ENABLE_RENUMBER)
+ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
FIND_PACKAGE(SalomePython)
FIND_PACKAGE(SalomeSWIG)
- SALOME_LOG_OPTIONAL_PACKAGE(Python MEDCOUPLING_MED_ENABLE_PYTHON)
- SALOME_LOG_OPTIONAL_PACKAGE(SWIG MEDCOUPLING_MED_ENABLE_PYTHON)
+ SALOME_LOG_OPTIONAL_PACKAGE(Python MEDCOUPLING_ENABLE_PYTHON)
+ SALOME_LOG_OPTIONAL_PACKAGE(SWIG MEDCOUPLING_ENABLE_PYTHON)
# Set the extra flags for SWIG for numpy and scipy
SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY)
IF(NUMPY_FOUND)
IF(SCIPY_FOUND)
SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY "${SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY};-DWITH_SCIPY")
ENDIF(SCIPY_FOUND)
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
IF(MEDCOUPLING_BUILD_DOC)
FIND_PACKAGE(SalomeDoxygen)
SET(MEDCOUPLING_INSTALL_SCRIPT_PYTHON ${MEDCOUPLING_INSTALL_BINS} CACHE PATH "Install path: MEDCoupling Python scripts")
SET(MEDCOUPLING_INSTALL_CMAKE_LOCAL cmake_files CACHE PATH "Install path: local MEDCoupling CMake files")
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
SET(MEDCOUPLING_INSTALL_PYTHON ${_pydir} CACHE PATH "Install path: MEDCoupling Python stuff")
SET(MEDCOUPLING_INSTALL_PYTHON_SHARED ${MEDCOUPLING_INSTALL_PYTHON}/shared_modules CACHE PATH
"Install path: MEDCoupling Python shared modules")
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
SET(MEDCOUPLING_INSTALL_RES share/resources CACHE PATH "Install path: MEDCoupling resources")
SET(MEDCOUPLING_INSTALL_DOC share/doc CACHE PATH "Install path: MEDCoupling documentation")
# Med specific:
SET(MEDCOUPLING_INSTALL_RES_DATA "${MEDCOUPLING_INSTALL_RES}/med" CACHE PATH "Install path: MEDCoupling specific data")
-#SET(MEDCOUPLING_MED_INSTALL_RES_SCRIPTS "${MEDCOUPLING_INSTALL_RES}/med" CACHE PATH "Install path: MEDCouplng specific scripts")
+#SET(MEDCOUPLING_INSTALL_RES_SCRIPTS "${MEDCOUPLING_INSTALL_RES}/med" CACHE PATH "Install path: MEDCouplng specific scripts")
MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_BINS MEDCOUPLING_INSTALL_LIBS MEDCOUPLING_INSTALL_IDLS MEDCOUPLING_INSTALL_HEADERS)
MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS MEDCOUPLING_INSTALL_SCRIPT_DATA MEDCOUPLING_INSTALL_SCRIPT_PYTHON)
MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_APPLISKEL_SCRIPTS MEDCOUPLING_INSTALL_APPLISKEL_PYTHON MEDCOUPLING_INSTALL_CMAKE MEDCOUPLING_INSTALL_CMAKE_LOCAL MEDCOUPLING_INSTALL_RES)
-MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_PYTHON MEDCOUPLING_INSTALL_PYTHON_SHARED MEDCOUPLING_MED_INSTALL_RES_DATA MEDCOUPLING_INSTALL_DOC)
+MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_PYTHON MEDCOUPLING_INSTALL_PYTHON_SHARED MEDCOUPLING_INSTALL_RES_DATA MEDCOUPLING_INSTALL_DOC)
# Header configuration
# ====================
SALOME_XVERSION(${PROJECT_NAME})
-SALOME_CONFIGURE_FILE(MEDCoupling_version.h.in MEDCoupling_version.h INSTALL ${SALOME_INSTALL_HEADERS})
-#SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
+SALOME_CONFIGURE_FILE(MEDCoupling_version.h.in MEDCoupling_version.h INSTALL ${MEDCOUPLING_INSTALL_HEADERS})
# Accumulate environment variables for MED module
#SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${MEDCOUPLING_INSTALL_BINS}
ADD_SUBDIRECTORY(doc)
ENDIF(MEDCOUPLING_BUILD_DOC)
-IF(NOT MEDCOUPLING_MED_MICROMED)
- IF(MEDCOUPLING_MED_WITH_FILE_EXAMPLES)
- ADD_SUBDIRECTORY(resources)
- ENDIF(MEDCOUPLING_MED_WITH_FILE_EXAMPLES)
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+ADD_SUBDIRECTORY(resources)
+ADD_SUBDIRECTORY(v8_work)
# Configuration export
# ====================
SET(_${PROJECT_NAME}_exposed_targets
interpkernel medcoupling medcouplingremapper)
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
LIST(APPEND _${PROJECT_NAME}_exposed_targets medloader)
- IF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+ IF(MEDCOUPLING_ENABLE_RENUMBER)
LIST(APPEND _${PROJECT_NAME}_exposed_targets renumbercpp)
ENDIF()
- IF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
+ IF(MEDCOUPLING_ENABLE_PARTITIONER)
LIST(APPEND _${PROJECT_NAME}_exposed_targets medpartitionercpp)
IF(MEDCOUPLING_BUILD_TESTS)
LIST(APPEND _${PROJECT_NAME}_exposed_targets MEDPARTITIONERTest)
ENDIF()
ENDIF()
IF(MEDCOUPLING_BUILD_TESTS)
- LIST(APPEND _${PROJECT_NAME}_exposed_targets InterpKernelTest)
+ LIST(APPEND _${PROJECT_NAME}_exposed_targets InterpKernelTest InterpKernelTestUtils)
ENDIF()
ENDIF()
IF(MEDCOUPLING_USE_MPI)
LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedmem)
- IF(NOT MEDCOUPLING_MED_MICROMED)
+ IF(NOT MEDCOUPLING_MICROMED)
LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedloader)
ENDIF()
IF(MEDCOUPLING_BUILD_TESTS)
- IF(NOT MEDCOUPLING_MED_MICROMED)
+ IF(NOT MEDCOUPLING_MICROMED)
LIST(APPEND _${PROJECT_NAME}_exposed_targets ParaMEDMEMTest)
ENDIF()
ENDIF()
# Ensure the variables are always defined for the configure (even if empty):
SET(MEDFILE_ROOT_DIR "${MEDFILE_ROOT_DIR}")
SET(MPI_ROOT_DIR "${MPI_ROOT_DIR}")
-SET(HDF5_ROOT_DIR "${HDF5_ROOT_DIR}")
SET(BOOST_ROOT_DIR "${BOOST_ROOT_DIR}")
SET(SWIG_ROOT_DIR "${SWIG_ROOT_DIR}")
SET(PYTHON_ROOT_DIR "${PYTHON_ROOT_DIR}")
SET(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}")
# Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-SALOME_CONFIGURE_PREPARE(Metis ParMetis Scotch XDR CppUnit Graphviz Doxygen Sphinx MPI
- Boost libXml2 Python HDF5 MEDFile)
+SALOME_CONFIGURE_PREPARE(MEDFile MPI Boost Swig Python CppUnit Graphviz Doxygen Sphinx
+ Metis ParMetis Scotch XDR)
CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake
INSTALL_DESTINATION "${MEDCOUPLING_INSTALL_CMAKE_LOCAL}"
PATH_VARS CONF_INCLUDE_DIRS MEDCOUPLING_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
MEDFILE_ROOT_DIR MPI_ROOT_DIR
- HDF5_ROOT_DIR BOOST_ROOT_DIR
- SWIG_ROOT_DIR PYTHON_ROOT_DIR CPPUNIT_ROOT_DIR GRAPHVIZ_ROOT_DIR DOXYGEN_ROOT_DIR
- SPHINX_ROOT_DIR METIS_ROOT_DIR PARMETIS_ROOT_DIR SCOTCH_ROOT_DIR XDR_ROOT_DIR)
+ BOOST_ROOT_DIR SWIG_ROOT_DIR PYTHON_ROOT_DIR CPPUNIT_ROOT_DIR GRAPHVIZ_ROOT_DIR DOXYGEN_ROOT_DIR
+ SPHINX_ROOT_DIR
+ METIS_ROOT_DIR PARMETIS_ROOT_DIR SCOTCH_ROOT_DIR XDR_ROOT_DIR)
WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
VERSION ${${PROJECT_NAME_UC}_VERSION}