X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=9a78206b35783d73b9f8f547e57f135dbac45336;hb=da31963dbaf5e0c4d1360861acb5678fef137af3;hp=f48ff773c92687244632bb3299db5c1ff98b2ffe;hpb=8a6b78bbaf919ab483b878b38e5cdcfbdbeb09de;p=modules%2Fmed.git diff --git a/CMakeLists.txt b/CMakeLists.txt index f48ff773c..9a78206b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D +# Copyright (C) 2012-2020 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,21 +19,15 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) INCLUDE(CMakeDependentOption) -PROJECT(SalomeMED C CXX) - -# Ensure a proper linker behavior: -CMAKE_POLICY(SET CMP0003 NEW) -IF(WIN32) - CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib -ENDIF(WIN32) +PROJECT(SalomeFIELDS C CXX) # Versioning # =========== # Project name, upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 5) +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 6) 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}) @@ -44,7 +38,7 @@ SET(${PROJECT_NAME_UC}_VERSION_DEV 1) SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") IF(EXISTS ${CONFIGURATION_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake") - INCLUDE(SalomeMacros) + INCLUDE(SalomeMacros NO_POLICY_SCOPE) ELSE() MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") ENDIF() @@ -56,16 +50,14 @@ ENDIF() SET(_default_MPI OFF) SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") IF(EXISTS ${KERNEL_ROOT_DIR}) - LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") FIND_PACKAGE(SalomeKERNEL REQUIRED) - KERNEL_WITH_CORBA() #check whether KERNEL builded with CORBA + KERNEL_WITH_CORBA() #check whether KERNEL built with CORBA ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS}) SET(_default_MPI ${SALOME_USE_MPI}) ELSE(EXISTS ${KERNEL_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR !") ENDIF(EXISTS ${KERNEL_ROOT_DIR}) -LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") # Platform setup # ============== @@ -77,19 +69,18 @@ FIND_PACKAGE(SalomeOmniORB REQUIRED) # User options # ============ INCLUDE(CMakeDependentOption) -OPTION(SALOME_MED_ENABLE_PYTHON "Build PYTHON bindings." ON) -OPTION(SALOME_MED_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON) -OPTION(SALOME_MED_WITH_QTTESTING "Build MED with QtTesting support." OFF) -OPTION(SALOME_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." ${_default_MPI}) -OPTION(SALOME_BUILD_GUI "Build GUI of MED." ON) -OPTION(SALOME_BUILD_TESTS "Build MED tests." ON) -OPTION(SALOME_BUILD_DOC "Build MED doc." ON) +OPTION(SALOME_FIELDS_ENABLE_PYTHON "Build PYTHON bindings." ON) +OPTION(SALOME_FIELDS_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON) +OPTION(SALOME_FIELDS_WITH_QTTESTING "Build FIELDS with QtTesting support." OFF) +OPTION(SALOME_USE_MPI "(Use MPI containers) - For FIELDS this triggers the build of ParaMEDMEM." ${_default_MPI}) +OPTION(SALOME_BUILD_GUI "Build GUI of FIELDS." ON) +OPTION(SALOME_BUILD_TESTS "Build FIELDS tests." ON) +OPTION(SALOME_BUILD_DOC "Build FIELDS doc." ON) # Find MEDCoupling (required) # ========================== 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") FIND_PACKAGE(SalomeMEDCoupling REQUIRED) # will reload HDF5, MEDFile, XDR, etc ... ELSE(EXISTS ${MEDCOUPLING_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need the MEDCoupling tool, please define MEDCOUPLING_ROOT_DIR !") @@ -109,32 +100,27 @@ ENDIF(NOT WIN32) IF(SALOME_BUILD_GUI) SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") IF(EXISTS ${GUI_ROOT_DIR}) - LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGUI REQUIRED) - SALOME_GUI_WITH_CORBA() #check whether GUI builded with CORBA + SALOME_GUI_WITH_CORBA() #check whether GUI built with CORBA SALOME_GUI_MODE(SALOME_USE_SALOMEOBJECT SALOME_USE_PYCONSOLE OPTIONAL SALOME_USE_PVVIEWER) ADD_DEFINITIONS(${GUI_DEFINITIONS}) INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS}) ELSE(EXISTS ${GUI_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR or turn option SALOME_BUILD_GUI to OFF !") ENDIF(EXISTS ${GUI_ROOT_DIR}) - IF(NOT SALOME_GUI_BUILD_WITH_QT5) - FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) - ELSE() - FIND_PACKAGE(SalomeQt5 REQUIRED) - ENDIF() + FIND_PACKAGE(SalomeQt5 REQUIRED) ENDIF(SALOME_BUILD_GUI) -IF(SALOME_MED_ENABLE_PYTHON) +IF(SALOME_FIELDS_ENABLE_PYTHON) FIND_PACKAGE(SalomePythonInterp) FIND_PACKAGE(SalomePythonLibs) FIND_PACKAGE(SalomeNumPySciPy) FIND_PACKAGE(SalomeSWIG) - SALOME_LOG_OPTIONAL_PACKAGE(PythonInterp SALOME_MED_ENABLE_PYTHON) - SALOME_LOG_OPTIONAL_PACKAGE(PythonLibs SALOME_MED_ENABLE_PYTHON) - SALOME_LOG_OPTIONAL_PACKAGE(SWIG SALOME_MED_ENABLE_PYTHON) + SALOME_LOG_OPTIONAL_PACKAGE(PythonInterp SALOME_FIELDS_ENABLE_PYTHON) + SALOME_LOG_OPTIONAL_PACKAGE(PythonLibs SALOME_FIELDS_ENABLE_PYTHON) + SALOME_LOG_OPTIONAL_PACKAGE(SWIG SALOME_FIELDS_ENABLE_PYTHON) FIND_PACKAGE(SalomeOmniORBPy REQUIRED) -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(SALOME_FIELDS_ENABLE_PYTHON) IF(SALOME_BUILD_TESTS) ENABLE_TESTING() @@ -182,31 +168,31 @@ SET(SALOME_INSTALL_CMAKE salome_adm/cmake_files CACHE PATH "Install path: SALOME SET(SALOME_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH "Install path: local SALOME CMake files") -IF(SALOME_MED_ENABLE_PYTHON) +IF(SALOME_FIELDS_ENABLE_PYTHON) SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) SET(SALOME_INSTALL_PYTHON ${_pydir}/salome CACHE PATH "Install path: SALOME Python stuff") SET(SALOME_INSTALL_PYTHON_SHARED ${SALOME_INSTALL_PYTHON}/shared_modules CACHE PATH "Install path: SALOME Python shared modules") -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(SALOME_FIELDS_ENABLE_PYTHON) SET(SALOME_INSTALL_RES share/salome/resources CACHE PATH "Install path: SALOME resources") SET(SALOME_INSTALL_DOC share/doc/salome CACHE PATH "Install path: SALOME documentation") # Med specific: -SET(SALOME_MED_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/med" CACHE PATH "Install path: SALOME MED specific data") -SET(SALOME_MED_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/med" CACHE PATH "Install path: SALOME MED specific scripts") -SET(SALOME_MED_INSTALL_TEST ${SALOME_INSTALL_BINS}/test) +SET(SALOME_FIELDS_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/fields" CACHE PATH "Install path: SALOME MED specific data") +SET(SALOME_FIELDS_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/fields" CACHE PATH "Install path: SALOME MED specific scripts") +SET(SALOME_FIELDS_INSTALL_TEST ${SALOME_INSTALL_BINS}/test) MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS) MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON) MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) -MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_MED_INSTALL_RES_DATA SALOME_MED_INSTALL_RES_SCRIPTS SALOME_INSTALL_DOC) +MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_FIELDS_INSTALL_RES_DATA SALOME_FIELDS_INSTALL_RES_SCRIPTS SALOME_INSTALL_DOC) # Header configuration # ==================== SALOME_XVERSION(${PROJECT_NAME}) -SALOME_CONFIGURE_FILE(MED_version.h.in MED_version.h INSTALL ${SALOME_INSTALL_HEADERS}) +SALOME_CONFIGURE_FILE(FIELDS_version.h.in FIELDS_version.h INSTALL ${SALOME_INSTALL_HEADERS}) SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) # Accumulate environment variables for MED module @@ -233,7 +219,7 @@ ADD_SUBDIRECTORY(resources) # Application tests # ================= -INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${SALOME_MED_INSTALL_TEST} RENAME CTestTestfile.cmake) +INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${SALOME_FIELDS_INSTALL_TEST} RENAME CTestTestfile.cmake) # Configuration export # ==================== @@ -248,8 +234,8 @@ IF(SALOME_USE_MPI) ENDIF() LIST(APPEND _${PROJECT_NAME}_exposed_targets - medcouplingcorba medcouplingclient medcalculator MEDEngineCommon MEDFactoryEngine MEDEngine) -IF(SALOME_MED_ENABLE_PYTHON) + medcouplingcorba medcouplingclient medcalculator MEDEngineCommon MEDFactoryEngine FIELDSEngine) +IF(SALOME_FIELDS_ENABLE_PYTHON) LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculatorspython) ENDIF() @@ -279,11 +265,7 @@ SET(CPPUNIT_ROOT_DIR "${CPPUNIT_ROOT_DIR}") SET(GRAPHVIZ_ROOT_DIR "${GRAPHVIZ_ROOT_DIR}") SET(DOXYGEN_ROOT_DIR "${DOXYGEN_ROOT_DIR}") SET(SPHINX_ROOT_DIR "${SPHINX_ROOT_DIR}") -IF(NOT SALOME_GUI_BUILD_WITH_QT5) - SET(QT_ROOT_DIR "${QT4_ROOT_DIR}") -ELSE() - SET(QT_ROOT_DIR "${QT5_ROOT_DIR}") -ENDIF() +SET(QT_ROOT_DIR "${QT5_ROOT_DIR}") # - in the install tree: # Get the relative path of the include directory so @@ -291,13 +273,8 @@ ENDIF() SET(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}") # Build variables that will be expanded when configuring SalomeConfig.cmake: -IF(NOT SALOME_GUI_BUILD_WITH_QT5) - SALOME_CONFIGURE_PREPARE(MEDCoupling Qt4 MPI omniORB CppUnit Graphviz Doxygen Sphinx - PThread Python) - ELSE() - SALOME_CONFIGURE_PREPARE(MEDCoupling Qt5 MPI omniORB CppUnit Graphviz Doxygen Sphinx +SALOME_CONFIGURE_PREPARE(MEDCoupling Qt5 MPI omniORB CppUnit Graphviz Doxygen Sphinx PThread Python) -ENDIF() CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake