X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=SalomeGEOMConfig.cmake.in;h=1e1b3e0ee51b7049f48d02215e77c1d5aa114510;hb=e01162a80debd9e62d881acb300259c5ef4b1238;hp=a0319f829c5aa91ebaa660c4da40efc7e2ba1a32;hpb=97a5bf28491d7e831e8d39e10a99c01a74c04575;p=modules%2Fgeom.git

diff --git a/SalomeGEOMConfig.cmake.in b/SalomeGEOMConfig.cmake.in
index a0319f829..1e1b3e0ee 100644
--- a/SalomeGEOMConfig.cmake.in
+++ b/SalomeGEOMConfig.cmake.in
@@ -43,47 +43,66 @@ SET_AND_CHECK(GEOM_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(GEOM_INCLUDE_DIRS "${GEOM_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(GEOM_INCLUDE_DIRS "${GEOM_INCLUDE_DIRS};@_SalomeGEOM_EXTRA_HEADERS@")
+SET(GEOM_DEFINITIONS "@KERNEL_DEFINITIONS@")
+
+# Package specific environment variables
+@_SalomeGEOM_EXTRA_ENV_FULL@
 
 #### Now the specificities
 
 # Options exported by the package:
-SET(SALOME_BUILD_DOC    @SALOME_BUILD_DOC@)
-SET(SALOME_BUILD_TESTS  @SALOME_BUILD_TESTS@)
+SET(SALOME_GEOM_BUILD_DOC    @SALOME_BUILD_DOC@)
+SET(SALOME_GEOM_BUILD_TESTS  @SALOME_BUILD_TESTS@)
 
 # Advanced options
-SET(SALOME_BUILD_GUI       @SALOME_BUILD_GUI@)
+SET(SALOME_GEOM_BUILD_GUI  @SALOME_BUILD_GUI@)
 SET(SALOME_GEOM_USE_OPENCV @SALOME_GEOM_USE_OPENCV@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")
 SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@")
+SET_AND_CHECK(VTK_ROOT_DIR_EXP "@PACKAGE_VTK_ROOT_DIR@")
 
 # Optional level 1 prerequisites:
-IF(SALOME_BUILD_GUI)
+IF(SALOME_GEOM_BUILD_GUI)
   SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
+  LIST(APPEND GEOM_DEFINITIONS   "@GUI_DEFINITIONS@")
 ENDIF()
 IF(SALOME_GEOM_USE_OPENCV)
   SET_AND_CHECK(OPENCV_ROOT_DIR_EXP "@PACKAGE_OPENCV_ROOT_DIR@")
+  LIST(APPEND GEOM_DEFINITIONS "-DWITH_OPENCV")
 ENDIF()
 
 # 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 CAS SalomeGUI OpenCV)
-SET(_PREREQ_CONFIG_DIR "@CAS_DIR@" "@SalomeGUI_DIR@" "@OpenCV_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)
-  ENDIF()
-ENDFOREACH()
+    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()
 
 # Installation directories
 SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@")
@@ -101,10 +120,17 @@ SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
 SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
 SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
 
-# Include KERNEL targets if they were not already loaded:
-IF(NOT (TARGET SALOMEBasics)) 
-  INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake")
-ENDIF()
+IF(SALOME_GEOM_BUILD_GUI) 
+  # Include GUI targets if they were not already loaded:
+  IF(NOT (TARGET Event)) 
+    INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake")
+  ENDIF()
+ELSE(SALOME_GEOM_BUILD_GUI) 
+  # Include KERNEL targets if they were not already loaded:
+  IF(NOT (TARGET SALOMEBasics) AND NOT SALOME_MED_STANDALONE) 
+    INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake")
+  ENDIF()
+ENDIF(SALOME_GEOM_BUILD_GUI)
 
 # Exposed GEOM targets:
 SET(GEOM_GEOMArchimede GEOMArchimede)
@@ -125,6 +151,7 @@ SET(GEOM_SalomeIDLGEOM SalomeIDLGEOM)
 SET(GEOM_STEPExport STEPExport)
 SET(GEOM_STEPImport STEPImport)
 SET(GEOM_STLExport STLExport)
+SET(GEOM_STLImport STLImport)
 SET(GEOM_ShHealOper ShHealOper)
 SET(GEOM_XAO XAO)
 SET(GEOM_AdvancedEngine AdvancedEngine)
@@ -153,3 +180,4 @@ SET(GEOM_RepairGUI RepairGUI)
 SET(GEOM_TransformationGUI TransformationGUI)
 SET(GEOM_ImportExportGUI ImportExportGUI)
 SET(GEOM_GEOMShapeRec GEOMShapeRec)
+SET(GEOM_CurveCreator CurveCreator)