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
Merge V9_dev branch into master
[modules/smesh.git]
/
src
/
SMESHDS
/
CMakeLists.txt
diff --git
a/src/SMESHDS/CMakeLists.txt
b/src/SMESHDS/CMakeLists.txt
index e5c153ceae634850a87c02347701cb2497501081..c68058be62e594fddc9c88000f0446bd866804ab 100644
(file)
--- a/
src/SMESHDS/CMakeLists.txt
+++ b/
src/SMESHDS/CMakeLists.txt
@@
-26,7
+26,7
@@
ENDIF(SALOME_SMESH_USE_TBB)
INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS}
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMDS
${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMDS
@@
-35,7
+35,7
@@
INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
${BOOST_DEFINITIONS}
)
@@
-45,8
+45,8
@@
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
${TBB_LIBS}
${KERNEL_SALOMELocalTrace}
SMDS
${TBB_LIBS}