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
/
OBJECT
/
CMakeLists.txt
diff --git
a/src/OBJECT/CMakeLists.txt
b/src/OBJECT/CMakeLists.txt
index 24999862f7f658b73bd8ce9ce1ed1bd4a263712c..29ff1303f23848228669b2cb38a698e55155f3d1 100644
(file)
--- a/
src/OBJECT/CMakeLists.txt
+++ b/
src/OBJECT/CMakeLists.txt
@@
-20,13
+20,12
@@
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
- ${QT_INCLUDES}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${MEDFILE_INCLUDE_DIRS}
${QWT_INCLUDE_DIR}
${GEOM_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${MEDFILE_INCLUDE_DIRS}
${QWT_INCLUDE_DIR}
${GEOM_INCLUDE_DIRS}
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
@@
-43,7
+42,7
@@
INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
@@
-52,7
+51,7
@@
ADD_DEFINITIONS(
SET(_link_LIBRARIES
${QT_LIBRARIES}
${VTK_LIBRARIES}
SET(_link_LIBRARIES
${QT_LIBRARIES}
${VTK_LIBRARIES}
- ${
CAS
_KERNEL}
+ ${
OpenCASCADE
_KERNEL}
${GEOM_GEOMObject}
${GUI_SalomeApp}
${GUI_SalomeObject}
${GEOM_GEOMObject}
${GUI_SalomeApp}
${GUI_SalomeObject}
@@
-80,6
+79,7
@@
SET(SMESHObject_HEADERS
SMESH_Actor.h
SMESH_Object.h
SMESH_ObjectDef.h
SMESH_Actor.h
SMESH_Object.h
SMESH_ObjectDef.h
+ SMESH_ActorProps.h
SMESH_ActorUtils.h
SMESH_ActorDef.h
SMESH_DeviceActor.h
SMESH_ActorUtils.h
SMESH_ActorDef.h
SMESH_DeviceActor.h
@@
-99,6
+99,7
@@
SET(SMESHObject_SOURCES
SMESH_Object.cxx
SMESH_DeviceActor.cxx
SMESH_Actor.cxx
SMESH_Object.cxx
SMESH_DeviceActor.cxx
SMESH_Actor.cxx
+ SMESH_ActorProps.cxx
SMESH_PreviewActorsCollection.cxx
SMESH_ExtractGeometry.cxx
SMESH_ActorUtils.cxx
SMESH_PreviewActorsCollection.cxx
SMESH_ExtractGeometry.cxx
SMESH_ActorUtils.cxx