Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMake: Add keyword NOCHECK for accumulating environment because included directories...
[modules/smesh.git]
/
SalomeSMESHConfig.cmake.in
diff --git
a/SalomeSMESHConfig.cmake.in
b/SalomeSMESHConfig.cmake.in
index 0212e3d84c77669709932b736ea07ac1fee43169..c4417cb2b39738538b161e9f01004e1034fe34f8 100644
(file)
--- a/
SalomeSMESHConfig.cmake.in
+++ b/
SalomeSMESHConfig.cmake.in
@@
-43,16
+43,25
@@
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@")
# 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@")
+
+# Package specific environment variables
+@_SalomeSMESH_EXTRA_ENV_FULL@
#### Now the specificities
# Options exported by the package:
#### 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
# 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_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@")
# Level 1 prerequisites:
SET_AND_CHECK(GEOM_ROOT_DIR_EXP "@PACKAGE_GEOM_ROOT_DIR@")
@@
-69,8
+78,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:
# 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")
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
+128,9
@@
SET(SMESH_MeshDriverUNV MeshDriverUNV)
SET(SMESH_MEDWrapperBase MEDWrapperBase)
SET(SMESH_MEDWrapper MEDWrapper)
SET(SMESH_MEDWrapper_V2_2 MEDWrapper_V2_2)
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)
SET(SMESH_SMESHObject SMESHObject)
SET(SMESH_GeomSelectionTools GeomSelectionTools)
SET(SMESH_SMDS SMDS)