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 branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
CMakeLists.txt
diff --git
a/src/StdMeshersGUI/CMakeLists.txt
b/src/StdMeshersGUI/CMakeLists.txt
index 74f46994099a8ac3218d37f78b573dc25040009e..e71e0c7795b435c4f5332b12bbe5aa16a6cea191 100644
(file)
--- a/
src/StdMeshersGUI/CMakeLists.txt
+++ b/
src/StdMeshersGUI/CMakeLists.txt
@@
-24,7
+24,7
@@
INCLUDE(UseQtExt)
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
${VTK_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
${VTK_INCLUDE_DIRS}
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${PYTHON_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
@@
-48,7
+48,7
@@
INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
${QWT_DEFINITIONS}
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
${QWT_DEFINITIONS}
@@
-57,9
+57,8
@@
ADD_DEFINITIONS(
# libraries to link to
SET(_link_LIBRARIES
${GUI_SalomeApp}
# libraries to link to
SET(_link_LIBRARIES
${GUI_SalomeApp}
- ${CAS_TKernel}
- ${CAS_TKBO}
- ${CAS_TKAdvTools}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${QWT_LIBRARY}
SalomeIDLSMESH
SMESHFiltersSelection
${QWT_LIBRARY}
SalomeIDLSMESH
SMESHFiltersSelection