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
/
StdMeshers_I
/
CMakeLists.txt
diff --git
a/src/StdMeshers_I/CMakeLists.txt
b/src/StdMeshers_I/CMakeLists.txt
index 04e09cfb6445d68254607ffd85d9abb5c01708c0..bcbb3fe2ee717f80670a46782a54664e6e96a417 100644
(file)
--- a/
src/StdMeshers_I/CMakeLists.txt
+++ b/
src/StdMeshers_I/CMakeLists.txt
@@
-20,7
+20,7
@@
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${HDF5_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
@@
-47,7
+47,7
@@
ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
@@
-61,8
+61,7
@@
ENDIF(WIN32)
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeGenericObj}
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeGenericObj}
- ${CAS_TKBRep}
- ${CAS_TKG3d}
+ ${OpenCASCADE_ModelingData_LIBRARIES}
SalomeIDLSMESH
StdMeshers
SMESHEngine
SalomeIDLSMESH
StdMeshers
SMESHEngine