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 'master' into gni/evolution
[modules/smesh.git]
/
src
/
SMESHClient
/
CMakeLists.txt
diff --git
a/src/SMESHClient/CMakeLists.txt
b/src/SMESHClient/CMakeLists.txt
index 4ac6d4322a9f651cb743a8639bf5ddbafd9e6f1e..9e7a11e75a370fa03841483bdf7b8f38d94fefe3 100644
(file)
--- a/
src/SMESHClient/CMakeLists.txt
+++ b/
src/SMESHClient/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-24,8
+24,7
@@
INCLUDE_DIRECTORIES(
${MEDFILE_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${MEDFILE_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
- ${CAS_INCLUDE_DIRS}
+ ${OpenCASCADE_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/Driver
${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/Driver
@@
-37,13
+36,14
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
+ ${PROJECT_SOURCE_DIR}/src/SMESH_I
${PROJECT_BINARY_DIR}/idl
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS}
${PROJECT_BINARY_DIR}/idl
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS}
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
${BOOST_DEFINITIONS}
)
@@
-64,15
+64,14
@@
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${GEOM_NMTDS}
${GEOM_SalomeIDLGEOM}
${KERNEL_SALOMELocalTrace}
${GEOM_NMTDS}
${GEOM_SalomeIDLGEOM}
- ${
CAS
_KERNEL}
+ ${
OpenCASCADE
_KERNEL}
SalomeIDLSMESH
SMDS
SMESHimpl
SMESHDS
SMESHControls
SalomeIDLSMESH
SMDS
SMESHimpl
SMESHDS
SMESHControls
+ SMESHEngine
MEDWrapper
MEDWrapper
- MEDWrapperBase
- MEDWrapper_V2_2
)
# --- headers ---
)
# --- headers ---