X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=SalomeMEDConfig.cmake.in;h=3e5ecddbb34fa8bcb614c3936778458e0a8d0b05;hb=ead421830853fe9d9d0bd997f979f92b251dd6bc;hp=bd7b3ae31b0a2d3760644fb6744e7e102f99f074;hpb=7d5fb5a50f6d091af34805871047f2fe72bdf293;p=modules%2Fmed.git

diff --git a/SalomeMEDConfig.cmake.in b/SalomeMEDConfig.cmake.in
index bd7b3ae31..3e5ecddbb 100644
--- a/SalomeMEDConfig.cmake.in
+++ b/SalomeMEDConfig.cmake.in
@@ -30,7 +30,7 @@
 # Load the dependencies for the libraries of @PROJECT_NAME@
 # (contains definitions for IMPORTED targets). This is only
 # imported if we are not built as a subproject (in this case targets are already there)
-IF(NOT TARGET medcoupling AND NOT @PROJECT_NAME@_BINARY_DIR)
+IF(NOT TARGET MEDFactoryEngine AND NOT @PROJECT_NAME@_BINARY_DIR)
   INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake")
 ENDIF()
 
@@ -59,9 +59,6 @@ SET(SALOME_MED_BUILD_GUI      @SALOME_BUILD_GUI@)
 # Level 1 prerequisites:
 
 # Optional level 1 prerequisites:
-
-SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_MEDFILE_ROOT_DIR@")
-
 SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")
 LIST(APPEND MED_DEFINITIONS "@KERNEL_DEFINITIONS@")
 IF(SALOME_MED_BUILD_GUI)
@@ -72,29 +69,31 @@ ENDIF(SALOME_MED_BUILD_GUI)
 # 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()
@@ -126,25 +125,14 @@ ELSE(SALOME_MED_BUILD_GUI)
 ENDIF(SALOME_MED_BUILD_GUI)
 
 # Exposed MED targets:
-# SET(MED_interpkernel interpkernel)
-# SET(MED_medcoupling medcoupling)
-# SET(MED_medcouplingremapper medcouplingremapper)
-# SET(MED_medloader medloader)
-# SET(MED_renumbercpp renumbercpp)
-# SET(MED_medpartitionercpp medpartitionercpp)
-# SET(MED_MEDPARTITIONERTest MEDPARTITIONERTest)
-# SET(MED_InterpKernelTest InterpKernelTest)
-# SET(MED_paramedmem paramedmem)
-# SET(MED_paramedloader paramedloader)
-# SET(MED_paramedcouplingcorba paramedcouplingcorba)
-# SET(MED_paramedmemcompo paramedmemcompo)
-# SET(MED_ParaMEDMEMTest ParaMEDMEMTest)
-# SET(MED_SalomeIDLMED SalomeIDLMED)
-# SET(MED_SalomeIDLMEDTests SalomeIDLMEDTests)
-# SET(MED_medcouplingcorba medcouplingcorba)
-# SET(MED_medcouplingclient medcouplingclient)
-# SET(MED_medcalculator medcalculator)
-# SET(MED_medcalculatorspython medcalculatorspython)
-# SET(MED_MEDFactoryEngine MEDFactoryEngine)
-# SET(MED_MEDCALCGUI_dialogs MEDCALCGUI_dialogs)
-# SET(MED_MEDCALCGUI MEDCALCGUI)
+SET(MED_paramedcouplingcorba paramedcouplingcorba)
+SET(MED_paramedmemcompo paramedmemcompo)
+SET(MED_SalomeIDLMED SalomeIDLMED)
+SET(MED_SalomeIDLMEDTests SalomeIDLMEDTests)
+SET(MED_medcouplingcorba medcouplingcorba)
+SET(MED_medcouplingclient medcouplingclient)
+SET(MED_medcalculator medcalculator)
+SET(MED_medcalculatorspython medcalculatorspython)
+SET(MED_MEDFactoryEngine MEDFactoryEngine)
+SET(MED_MEDCALCGUI_dialogs MEDCALCGUI_dialogs)
+SET(MED_MEDCALCGUI MEDCALCGUI)