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 remote-tracking branch 'origin/master'
[modules/smesh.git]
/
src
/
Controls
/
CMakeLists.txt
diff --git
a/src/Controls/CMakeLists.txt
b/src/Controls/CMakeLists.txt
index 74798ca6756f6c46972d8d757574266402d14798..8f48ab1f2db96b41649d928b92657f786378e686 100644
(file)
--- a/
src/Controls/CMakeLists.txt
+++ b/
src/Controls/CMakeLists.txt
@@
-20,7
+20,7
@@
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
@@
-31,19
+31,16
@@
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
${VTK_LIBRARIES}
${BOOST_DEFINITIONS}
)
# libraries to link to
SET(_link_LIBRARIES
${VTK_LIBRARIES}
- ${CAS_TKernel}
- ${CAS_TKBRep}
- ${CAS_TKG3d}
- ${CAS_TKTopAlgo}
- ${CAS_TKGeomBase}
- ${CAS_TKGeomAlgo}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
+ ${OpenCASCADE_ModelingData_LIBRARIES}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
SMDS
SMESHDS
SMESHUtils
SMDS
SMESHDS
SMESHUtils