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
bos #24257 [CEA] Fatal error when creating a submesh if the mesh is on a sub-shape
[modules/smesh.git]
/
src
/
SMESHDS
/
CMakeLists.txt
diff --git
a/src/SMESHDS/CMakeLists.txt
b/src/SMESHDS/CMakeLists.txt
index f5fb89fbe01208633349a398c5b428c15726b481..c5ff4364c52e4986c6765a48a40531e9160beac1 100644
(file)
--- a/
src/SMESHDS/CMakeLists.txt
+++ b/
src/SMESHDS/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-19,27
+19,36
@@
# --- options ---
# additional include directories
# --- options ---
# additional include directories
+
+IF(SALOME_SMESH_USE_TBB)
+ SET(TBB_INCLUDES ${TBB_INCLUDE_DIRS})
+ENDIF(SALOME_SMESH_USE_TBB)
+
INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS}
- ${CAS_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
+ ${OpenCASCADE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMDS
${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMDS
-
+ ${TBB_INCLUDES}
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
${BOOST_DEFINITIONS}
)
+IF(SALOME_SMESH_USE_TBB)
+ SET(TBB_LIBS ${TBB_LIBRARIES})
+ENDIF(SALOME_SMESH_USE_TBB)
+
# libraries to link to
SET(_link_LIBRARIES
# libraries to link to
SET(_link_LIBRARIES
- ${
CAS
_KERNEL}
- ${
CAS_TKBRep
}
+ ${
OpenCASCADE
_KERNEL}
+ ${
OpenCASCADE_ModelingData_LIBRARIES
}
${KERNEL_SALOMELocalTrace}
SMDS
${KERNEL_SALOMELocalTrace}
SMDS
+ ${TBB_LIBS}
)
# --- headers ---
)
# --- headers ---