X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=SalomeSMESHConfig.cmake.in;h=c875e75c0e3a04ae723dad65a96d3f8073de2fa5;hp=0212e3d84c77669709932b736ea07ac1fee43169;hb=233c58b13b78d8430a69c7f9b93056b6e4bbcd51;hpb=3c2705b25c2e026bd033aa2c2843eecfc36ceb80

diff --git a/SalomeSMESHConfig.cmake.in b/SalomeSMESHConfig.cmake.in
index 0212e3d84..c875e75c0 100644
--- a/SalomeSMESHConfig.cmake.in
+++ b/SalomeSMESHConfig.cmake.in
@@ -43,16 +43,22 @@ SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(SMESH_INCLUDE_DIRS "${SMESH_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(SMESH_INCLUDE_DIRS "${SMESH_INCLUDE_DIRS};@_SalomeSMESH_EXTRA_HEADERS@")
+SET(SMESH_DEFINITIONS "@GEOM_DEFINITIONS@")
 
 #### Now the specificities
 
 # Options exported by the package:
-SET(SALOME_BUILD_DOC    @SALOME_BUILD_DOC@)
+SET(SALOME_SMESH_BUILD_DOC @SALOME_BUILD_DOC@)
 
 # Advanced options
-SET(SALOME_BUILD_GUI       @SALOME_BUILD_GUI@)
+SET(SALOME_SMESH_BUILD_GUI @SALOME_BUILD_GUI@)
 SET(SALOME_SMESH_USE_CGNS  @SALOME_SMESH_USE_CGNS@)
 SET(SALOME_SMESH_USE_TBB   @SALOME_SMESH_USE_TBB@)
+SET(SALOME_SMESH_ENABLE_MEFISTO   @SALOME_SMESH_ENABLE_MEFISTO@)
+IF(NOT WIN32)
+  LIST(APPEND SMESH_DEFINITIONS "-DENABLE_MEFISTO")
+ENDIF(NOT WIN32)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(GEOM_ROOT_DIR_EXP "@PACKAGE_GEOM_ROOT_DIR@")
@@ -69,8 +75,8 @@ 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 CGNS TBB)
-SET(_PREREQ_CONFIG_DIR "@CGNS_DIR@" "@TBB_DIR@" )
+SET(_PREREQ CGNS TBB MEDFile)
+SET(_PREREQ_CONFIG_DIR "@CGNS_DIR@" "@TBB_DIR@" "@MEDFile_DIR@")
 LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
 # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
 MATH(EXPR _range "${_list_len}-1")
@@ -119,7 +125,9 @@ SET(SMESH_MeshDriverUNV MeshDriverUNV)
 SET(SMESH_MEDWrapperBase MEDWrapperBase)
 SET(SMESH_MEDWrapper MEDWrapper)
 SET(SMESH_MEDWrapper_V2_2 MEDWrapper_V2_2)
-SET(SMESH_MEFISTO2D MEFISTO2D)
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+  SET(SMESH_MEFISTO2D MEFISTO2D)
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
 SET(SMESH_SMESHObject SMESHObject)
 SET(SMESH_GeomSelectionTools GeomSelectionTools)
 SET(SMESH_SMDS SMDS)