X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=SalomeHexoticPLUGINConfig.cmake.in;h=a08561b715e0a9472128c48668c8fc2f3dce43ce;hb=e2bac3fbdf32547b9826afeca63e4f5545a19164;hp=a6db03c9b6b1282641adf626f71f6260bd096d3b;hpb=561dee6062c3014e0d516b5461455121e4b67a8e;p=plugins%2Fhexoticplugin.git

diff --git a/SalomeHexoticPLUGINConfig.cmake.in b/SalomeHexoticPLUGINConfig.cmake.in
index a6db03c..a08561b 100644
--- a/SalomeHexoticPLUGINConfig.cmake.in
+++ b/SalomeHexoticPLUGINConfig.cmake.in
@@ -46,12 +46,14 @@ SET_AND_CHECK(HexoticPLUGIN_INCLUDE_DIRS "${HexoticPLUGIN_ROOT_DIR_EXP}/@SALOME_
 SET(HexoticPLUGIN_INCLUDE_DIRS "${HexoticPLUGIN_INCLUDE_DIRS};@_SalomeHexoticPLUGIN_EXTRA_HEADERS@")
 SET(HexoticPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
 
+# Package specific environment variables
+@_SalomeHexoticPLUGIN_EXTRA_ENV_FULL@
+
 #### Now the specificities
 
 # Options exported by the package:
-#SET(SALOME_HexoticPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@)
-SET(SALOME_HexoticPLUGIN_BUILD_DOC    @SALOME_BUILD_DOC@)
-
+SET(SALOME_HexoticPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_HexoticPLUGIN_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Advanced options
 SET(SALOME_HexoticPLUGIN_BUILD_GUI @SALOME_BUILD_GUI@)
@@ -69,21 +71,32 @@ IF(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN)
 # 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)
-SET(_PREREQ_CONFIG_DIR)
+SET(_PREREQ @_PREREQ_LIST@)
+SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
 LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-# 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)
-  IF(_pkg_dir)
-     MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-     FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
+IF(NOT _list_len 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)
-  ENDIF()
-ENDFOREACH()
+    ENDIF()
+  ENDFOREACH()
+ENDIF()
 
 # Installation directories
 SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@")