X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=SalomePARAVISConfig.cmake.in;h=6b0d033fdbbab30c205c14636c45bc915b8cc6e1;hb=22c16b701baea247a046a70c98cfbf4bbcfb6187;hp=e2ec40981103039a06923c4f0f519afd3c16d405;hpb=216b73d56a11d0b5f0ef26acfd85936f92c5f8ac;p=modules%2Fparavis.git

diff --git a/SalomePARAVISConfig.cmake.in b/SalomePARAVISConfig.cmake.in
index e2ec4098..6b0d033f 100644
--- a/SalomePARAVISConfig.cmake.in
+++ b/SalomePARAVISConfig.cmake.in
@@ -5,7 +5,7 @@
 #
 
 ###############################################################
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2022  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
@@ -54,18 +54,13 @@ SET(SALOME_PARAVIS_LIGHT_ONLY  @SALOME_LIGHT_ONLY@)
 SET(SALOME_PARAVIS_USE_GEOM_SOURCE  @SALOME_PARAVIS_USE_GEOM_SOURCE@)
 SET(SALOME_PARAVIS_USE_SMESH_SOURCE  @SALOME_PARAVIS_USE_SMESH_SOURCE@)
 
-# Advanced options
-SET(SALOME_USE_OCCVIEWER    @SALOME_USE_OCCVIEWER@)
-SET(SALOME_USE_GLVIEWER     @SALOME_USE_GLVIEWER@)
-SET(SALOME_USE_VTKVIEWER    @SALOME_USE_VTKVIEWER@)
-SET(SALOME_USE_PLOT2DVIEWER @SALOME_USE_PLOT2DVIEWER@)
 
 # Level 1 prerequisites:
 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)
@@ -82,32 +77,34 @@ SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_MEDFILE_ROOT_DIR@")
 
 # Optional level 1 prerequisites:
 
-# For all prerequisites, load the corresponding targets if the package was used 
+# For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})  
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()
@@ -135,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)