23582: [CEA] Rename MED module to FIELDS

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e312da452171a110c59e6bc41c32212e357c86b..9c87b71106f3c2e1ec70d286c085a16acbbf77ab 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,7 @@ OPTION(SALOME_BUILD_DOC "Generate SALOME GUI documentation" ON)
 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_BUILD_CORBA_PLUGINS "Build PARAVIS CORBA plugins (ParaMEDCorba -- this requires the SALOME MED module)" ON)
+OPTION(SALOME_PARAVIS_BUILD_CORBA_PLUGINS "Build PARAVIS CORBA plugins (ParaMEDCorba -- this requires the SALOME FIELDS 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
@@ -148,11 +148,11 @@ SET(SALOME_PARAVIS_BUILD_INSITU OFF)
 IF(SALOME_PARAVIS_BUILD_PLUGINS)
    # 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)
+      SET(FIELDS_ROOT_DIR $ENV{FIELDS_ROOT_DIR} CACHE PATH "Path to the SALOME FIELDS module")
+      IF(EXISTS ${FIELDS_ROOT_DIR})
+         LIST(APPEND CMAKE_MODULE_PATH "${FIELDS_ROOT_DIR}/adm_local/cmake_files")
+         FIND_PACKAGE(SalomeFIELDS)
+         SALOME_LOG_OPTIONAL_PACKAGE(SalomeFIELDS SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
          IF(SALOME_USE_MPI)
            SET(SALOME_PARAVIS_BUILD_INSITU ON)
          ENDIF(SALOME_USE_MPI)
@@ -313,7 +313,7 @@ ENDIF()
 # Ensure the variables are always defined for the configure:
 SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
 SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
-SET(MED_ROOT_DIR "${MED_ROOT_DIR}")
+SET(FIELDS_ROOT_DIR "${FIELDS_ROOT_DIR}")
 SET(MEDFILE_ROOT_DIR "${MEDFILE_ROOT_DIR}")
 SET(MEDCOUPLING_ROOT_DIR "${MEDCOUPLING_ROOT_DIR}")
 SET(GEOM_ROOT_DIR "${GEOM_ROOT_DIR}")
@@ -328,7 +328,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
-    KERNEL_ROOT_DIR GUI_ROOT_DIR MED_ROOT_DIR MEDFILE_ROOT_DIR MEDCOUPLING_ROOT_DIR GEOM_ROOT_DIR SMESH_ROOT_DIR)
+    KERNEL_ROOT_DIR GUI_ROOT_DIR FIELDS_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
@@ -338,7 +338,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
 #    ${PROJECT_BINARY_DIR}/to_install/${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)
+#    KERNEL_ROOT_DIR GUI_ROOT_DIR FIELDS_ROOT_DIR MEDFILE_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}

diff --git a/SalomePARAVISConfig.cmake.in b/SalomePARAVISConfig.cmake.in
index b3a16973db2360deaf68b1d058f837034fae8945..981208e54531b4c2c34d8091e8d24544dec2d3fe 100644 (file)
--- a/SalomePARAVISConfig.cmake.in
+++ b/SalomePARAVISConfig.cmake.in
@@ -59,8 +59,8 @@ SET(SALOME_PARAVIS_USE_SMESH_SOURCE  @SALOME_PARAVIS_USE_SMESH_SOURCE@)
 SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")
 SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
 IF(SALOME_PARAVIS_BUILD_PLUGINS)
-  SET_AND_CHECK(MED_ROOT_DIR_EXP "@PACKAGE_MED_ROOT_DIR@")
-  LIST(APPEND PARAVIS_DEFINITIONS "@MED_DEFINITIONS@")
+  SET_AND_CHECK(FIELDS_ROOT_DIR_EXP "@PACKAGE_FIELDS_ROOT_DIR@")
+  LIST(APPEND PARAVIS_DEFINITIONS "@FIELDS_DEFINITIONS@")
 ENDIF()
 
 IF(SALOME_PARAVIS_USE_GEOM_SOURCE)
@@ -132,9 +132,9 @@ IF(NOT (TARGET Event))
   INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake")
 ENDIF()
 IF(SALOME_PARAVIS_BUILD_PLUGINS)
-  # Include MED targets if they were not already loaded:
+  # Include FIELDS targets if they were not already loaded:
   IF(NOT (TARGET SalomeIDLMED)) 
-    INCLUDE("${MED_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeMEDTargets.cmake")
+    INCLUDE("${FIELDS_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeFIELDSTargets.cmake")
   ENDIF()
 ENDIF()
 IF(SALOME_PARAVIS_USE_GEOM_SOURCE)

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 544cd60bb443f83469a20c401b00bbad1df9bc2b..52a5a96653f6ee37798c2a3a87d62da4f3f5c4f3 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -5,7 +5,7 @@ IF(SALOME_PARAVIS_BUILD_INSITU)
     ${OMNIORB_INCLUDE_DIR}
     ${KERNEL_INCLUDE_DIRS}
     ${PROJECT_BINARY_DIR}/idl
-    ${MED_INCLUDE_DIRS}
+    ${FIELDS_INCLUDE_DIRS}
     ${MEDCOUPLING_INCLUDE_DIRS}
   )
 
@@ -16,16 +16,16 @@ IF(SALOME_PARAVIS_BUILD_INSITU)
 
   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(SalomeIDLPARAVIS "${SalomeIDLPARAVIS_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}")
   INSTALL(TARGETS SalomeIDLPARAVIS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
-ENDIF(SALOME_PARAVIS_BUILD_INSITU)
\ No newline at end of file
+ENDIF(SALOME_PARAVIS_BUILD_INSITU)

diff --git a/src/Insitu/VisualizationComponent/CMakeLists.txt b/src/Insitu/VisualizationComponent/CMakeLists.txt
index 0517d6853b9a0bbd47a58a4222de299d966cc18e..132a0df6adbe1ba46190303e1376639f0b3263e5 100644 (file)
--- a/src/Insitu/VisualizationComponent/CMakeLists.txt
+++ b/src/Insitu/VisualizationComponent/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
-  ${MED_INCLUDE_DIRS}
+  ${FIELDS_INCLUDE_DIRS}
   ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../VisualizationLibrary
 )
@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES(
 # --- definitions ---
 ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
-  ${MED_DEFINITIONS}
+  ${FIELDS_DEFINITIONS}
   ${MEDCOUPLING_DEFINITIONS}
 )
 
@@ -28,13 +28,11 @@ SET(_link_LIBRARIES
   ${KERNEL_SalomeMPIContainer}
   MEDLoaderForPV
   visulib
-  ${MED_SalomeIDLMED}
-  ${MED_med}
-  ${MED_medcouplingcorba}
-  ${MED_medcouplingclient}
-
-  ${MED_paramedmemcompo}
-  ${MED_paramedcouplingcorba}  
+  ${FIELDS_SalomeIDLMED}
+  ${FIELDS_medcouplingcorba}
+  ${FIELDS_medcouplingclient}
+  ${FIELDS_paramedmemcompo}
+  ${FIELDS_paramedcouplingcorba}  
 )
 
 # --- headers ---

diff --git a/src/Plugins/MEDReader/CMakeLists.txt b/src/Plugins/MEDReader/CMakeLists.txt
index dd004c5c7a56de32e3ff85ff67dfcb3789b4de14..441b25d0dd6383c40d746a3b0b35a4c6a4a81855 100644 (file)
--- a/src/Plugins/MEDReader/CMakeLists.txt
+++ b/src/Plugins/MEDReader/CMakeLists.txt
@@ -123,7 +123,7 @@ INCLUDE_DIRECTORIES(
   ${MEDCOUPLING_INCLUDE_DIRS}
   ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
-  ${MED_ROOT_DIR}/include/salome
+  ${FIELDS_ROOT_DIR}/include/salome
   )
 
 IF(HDF5_IS_PARALLEL)

diff --git a/src/Plugins/MEDReader/IO/Testing/Cxx/CMakeLists.txt b/src/Plugins/MEDReader/IO/Testing/Cxx/CMakeLists.txt
index e52d9a4d78ccda212002632a0ef74df7540c4146..6510c10a0e3a4e7bc3d6a704a6730bd143e8ab5a 100644 (file)
--- a/src/Plugins/MEDReader/IO/Testing/Cxx/CMakeLists.txt
+++ b/src/Plugins/MEDReader/IO/Testing/Cxx/CMakeLists.txt
@@ -20,7 +20,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../..)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../..)
 INCLUDE_DIRECTORIES(${MEDCOUPLING_INCLUDE_DIRS} ${MEDFILE_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${MED_ROOT_DIR}/include/salome)
+INCLUDE_DIRECTORIES(${FIELDS_ROOT_DIR}/include/salome)
 
 SET( TestMedReader_SRCS TestMedReader.cxx )
 

diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index 7728d30ff82e25be323dd83ed801b8ade1d1c651..7d28d37e5d62b0b9106ae34366e4655104393ade 100644 (file)
--- a/src/Plugins/ParaMEDCorba/CMakeLists.txt
+++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt
@@ -52,7 +52,7 @@ PROJECT( ParaMEDCorba )
       SERVER_MANAGER_XML ParaMEDCorbaServerManager.xml
       SERVER_MANAGER_SOURCES ${PARACORBAPLUG_SRCS} )
     
-    INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${MED_ROOT_DIR}/include/salome ${KERNEL_ROOT_DIR}/include/salome)
+    INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${FIELDS_ROOT_DIR}/include/salome ${KERNEL_ROOT_DIR}/include/salome)
     ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 
     TARGET_LINK_LIBRARIES(ParaMEDMEM2VTK
@@ -63,7 +63,7 @@ PROJECT( ParaMEDCorba )
       vtkPVVTKExtensionsRendering
       pqCore
       ${OMNIORB_LIBRARIES}
-      ${MED_SalomeIDLMED}
+      ${FIELDS_SalomeIDLMED}
       ${KERNEL_SalomeIDLKernel}
       )
     TARGET_LINK_LIBRARIES(ParaMEDCorbaPlugin