0023582: [CEA] Rename MED module to FIELDS

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5e6ad88d1090b6a3055e38628281c9c84c50027..925aa6fea7ba1908e211d4fb3704918f6e97496e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,20 +85,20 @@ FIND_PACKAGE(SalomePythonLibs REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
   
-# Find MED
+# Find FIELDS
 # ===========
 
-SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CACHE PATH "Path to the Salome MED")
-IF(EXISTS ${MED_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${MED_ROOT_DIR}/adm_local/cmake_files")
-  FIND_PACKAGE(SalomeMED REQUIRED)
-  IF(SALOME_MED_STANDALONE)
-    MESSAGE(FATAL_ERROR "We absolutely need a Salome MED with KERNEL, 
-                         please set SALOME_MED_STANDALONE=OFF when building MED module.")
+SET(FIELDS_ROOT_DIR $ENV{FIELDS_ROOT_DIR} CACHE PATH "Path to the Salome FIELDS")
+IF(EXISTS ${FIELDS_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${FIELDS_ROOT_DIR}/adm_local/cmake_files")
+  FIND_PACKAGE(SalomeFIELDS REQUIRED)
+  IF(SALOME_FIELDS_STANDALONE)
+    MESSAGE(FATAL_ERROR "We absolutely need a Salome FIELDS with KERNEL, 
+                         please set SALOME_FIELDS_STANDALONE=OFF when building FIELDS module.")
   ENDIF()
-ELSE(EXISTS ${MED_ROOT_DIR})
-  MESSAGE(FATAL_ERROR "We absolutely need a Salome MED, please define MED_ROOT_DIR")
-ENDIF(EXISTS ${MED_ROOT_DIR})
+ELSE(EXISTS ${FIELDS_ROOT_DIR})
+  MESSAGE(FATAL_ERROR "We absolutely need a Salome FIELDS, please define FIELDS_ROOT_DIR")
+ENDIF(EXISTS ${FIELDS_ROOT_DIR})
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
@@ -177,7 +177,7 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #   - in the build tree:
 
 # Ensure the variables are always defined for the configure:
-SET(MED_ROOT_DIR "${MED_ROOT_DIR}")
+SET(FIELDS_ROOT_DIR "${FIELDS_ROOT_DIR}")
  
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
 
@@ -188,7 +188,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
     ${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
-    MED_ROOT_DIR)
+    FIELDS_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}

diff --git a/README b/README
index 82f7521a44a8e958a59a2d3c75d0068b83770442..072839a1492dec118cb4bba220e264388f110375 100644 (file)
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ About SALOME PYCALCULATOR sample
 ********************************
 
 PYCALCULATOR module implements a sample of Python-based SALOME component.
-It shows an example of a module that interfaces with SALOME MED.
+It shows an example of a module that interfaces with SALOME FIELDS.
 
 For more information please visit the SALOME platform web site:
 
@@ -42,7 +42,7 @@ site:
 
   <http://www.salome-platform.org/downloads/license/>
 
-Note: SALOME PYCALCULATOR needs SALOME KERNEL and SALOME MED modules as
+Note: SALOME PYCALCULATOR needs SALOME KERNEL and SALOME FIELDS modules as
 pre-requisites.
 
 ------------------

diff --git a/SalomePYCALCULATORConfig.cmake.in b/SalomePYCALCULATORConfig.cmake.in
index 4075b9652b1b20580dcf2154403cd6a440972157..3716ff0b7437bc14b207bde26841bebfaea3331c 100644 (file)
--- a/SalomePYCALCULATORConfig.cmake.in
+++ b/SalomePYCALCULATORConfig.cmake.in
@@ -37,7 +37,7 @@ SET_AND_CHECK(PYCALCULATOR_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 # Include directories
 SET_AND_CHECK(PYCALCULATOR_INCLUDE_DIRS "${PYCALCULATOR_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
 SET(PYCALCULATOR_INCLUDE_DIRS "${PYCALCULATOR_INCLUDE_DIRS};@_SalomePYCALCULATOR_EXTRA_HEADERS@")
-SET(PYCALCULATOR_DEFINITIONS "@MED_DEFINITIONS@")
+SET(PYCALCULATOR_DEFINITIONS "@FIELDS_DEFINITIONS@")
 
 # Package specific environment variables
 @_SalomePYCALCULATOR_EXTRA_ENV_FULL@
@@ -56,7 +56,7 @@ SET(SALOME_PYCALCULATOR_BUILD_TESTS @SALOME_BUILD_TESTS@)
 SET(SALOME_PYCALCULATOR_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites:
-SET_AND_CHECK(MED_ROOT_DIR_EXP  "@PACKAGE_MED_ROOT_DIR@")
+SET_AND_CHECK(FIELDS_ROOT_DIR_EXP  "@PACKAGE_FIELDS_ROOT_DIR@")
 
 # For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
@@ -107,9 +107,9 @@ SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
 SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
 SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
 
-# Include MED targets if they were not already loaded:
-IF(NOT (TARGET medcoupling))
-  INCLUDE("${MED_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeMEDTargets.cmake")
+# Include FIELDS targets if they were not already loaded:
+IF(NOT (TARGET SalomeIDLMED))
+  INCLUDE("${FIELDS_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeFIELDSTargets.cmake")
 ENDIF()
 
 # Exposed PYCALCULATOR targets:

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index a0b115489265f01a720850136a1abdac17599496..aa2286cc2587f1152276bd8e74faa754b6b1b745 100755 (executable)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${KERNEL_INCLUDE_DIRS}
-  ${MED_INCLUDE_DIRS}
+  ${FIELDS_INCLUDE_DIRS}
 )
 
 SET(SalomeIDLPYCALCULATOR_IDLSOURCES
@@ -32,12 +32,12 @@ SET(SalomeIDLPYCALCULATOR_IDLSOURCES
 
 SET(_idl_include_dirs
   ${KERNEL_ROOT_DIR}/idl/salome
-  ${MED_ROOT_DIR}/idl/salome
+  ${FIELDS_ROOT_DIR}/idl/salome
 )
 
 SET(_idl_link_flags
   ${KERNEL_SalomeIDLKernel}
-  ${MED_SalomeIDLMED}
+  ${FIELDS_SalomeIDLMED}
 )
 
 OMNIORB_ADD_MODULE(SalomeIDLPYCALCULATOR "${SalomeIDLPYCALCULATOR_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}")