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 branch 'V8_4_BR'
[modules/smesh.git]
/
src
/
SMESHUtils
/
CMakeLists.txt
diff --git
a/src/SMESHUtils/CMakeLists.txt
b/src/SMESHUtils/CMakeLists.txt
index c21a8a6d5c4d8e8493a50531b66bb1eff76f0e87..ae011b71ade048abc82f45bce647c72eb09f6b97 100644
(file)
--- a/
src/SMESHUtils/CMakeLists.txt
+++ b/
src/SMESHUtils/CMakeLists.txt
@@
-21,7
+21,7
@@
# additional include directories
INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS}
# additional include directories
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
@@
-29,24
+29,17
@@
INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
# libraries to link to
SET(_link_LIBRARIES
${BOOST_DEFINITIONS}
)
# libraries to link to
SET(_link_LIBRARIES
- ${CAS_TKShHealing}
- ${CAS_TKPrim}
- ${CAS_TKernel}
- ${CAS_TKBRep}
- ${CAS_TKG2d}
- ${CAS_TKG3d}
- ${CAS_TKGeomBase}
- ${CAS_TKGeomAlgo}
- ${CAS_TKTopAlgo}
- ${CAS_TKMesh}
- ${Boost_LIBRARIES}
- SMDS
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
+ ${OpenCASCADE_ModelingData_LIBRARIES}
+ ${Boost_LIBRARIES}
+ SMDS
)
# --- headers ---
)
# --- headers ---
@@
-67,7
+60,8
@@
SET(SMESHUtils_HEADERS
SMESH_MeshAlgos.hxx
SMESH_MAT2d.hxx
SMESH_ControlPnt.hxx
SMESH_MeshAlgos.hxx
SMESH_MAT2d.hxx
SMESH_ControlPnt.hxx
-)
+ SMESH_Delaunay.hxx
+ )
# --- sources ---
# --- sources ---
@@
-83,7
+77,12
@@
SET(SMESHUtils_SOURCES
SMESH_MAT2d.cxx
SMESH_FreeBorders.cxx
SMESH_ControlPnt.cxx
SMESH_MAT2d.cxx
SMESH_FreeBorders.cxx
SMESH_ControlPnt.cxx
-)
+ SMESH_DeMerge.cxx
+ SMESH_Delaunay.cxx
+ SMESH_FillHole.cxx
+ SMESH_Triangulate.cxx
+ SMESH_Offset.cxx
+ )
# --- rules ---
# --- rules ---