Increment version: 9.2.1

[modules/med.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dda5a42ba248d6f4391364832199dcb985446f8..99baa58edb56c26fee25a4dad2ab5522ed8df227 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
 INCLUDE(CMakeDependentOption)
-PROJECT(SalomeMED C CXX)
+PROJECT(SalomeFIELDS C CXX)
 
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
@@ -32,9 +32,9 @@ ENDIF(WIN32)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
@@ -58,7 +58,7 @@ 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})
@@ -77,13 +77,13 @@ 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)
 # ==========================
@@ -111,7 +111,7 @@ IF(SALOME_BUILD_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})
@@ -125,16 +125,16 @@ IF(SALOME_BUILD_GUI)
     ENDIF()
 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 +182,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 +233,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 +248,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()