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' of https://codev-tuleap.cea.fr/plugins/git/salome/smesh
[modules/smesh.git]
/
src
/
SMESH_I
/
CMakeLists.txt
diff --git
a/src/SMESH_I/CMakeLists.txt
b/src/SMESH_I/CMakeLists.txt
index 3643f0928f6fdc8c82bccaa8de9e0f4d6d30fc57..e04e4a60403bc0c091f041eb1919bd091e61ed1e 100644
(file)
--- a/
src/SMESH_I/CMakeLists.txt
+++ b/
src/SMESH_I/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-20
21
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
@@
-21,18
+21,19
@@
# additional include directories
INCLUDE_DIRECTORIES(
${OMNIORB_INCLUDE_DIR}
# additional include directories
INCLUDE_DIRECTORIES(
${OMNIORB_INCLUDE_DIR}
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${HDF5_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
- ${
VTK
_INCLUDE_DIRS}
+ ${
MEDFILE
_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
+ ${MEDCOUPLING_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHDS
- ${PROJECT_SOURCE_DIR}/src/
MEDWrapper/Base
- ${PROJECT_SOURCE_DIR}/src/MEDWrapper
/Factory
+ ${PROJECT_SOURCE_DIR}/src/
SMESH_I
+ ${PROJECT_SOURCE_DIR}/src/MEDWrapper
${PROJECT_SOURCE_DIR}/src/Driver
${PROJECT_SOURCE_DIR}/src/DriverMED
${PROJECT_SOURCE_DIR}/src/DriverCGNS
${PROJECT_SOURCE_DIR}/src/Driver
${PROJECT_SOURCE_DIR}/src/DriverMED
${PROJECT_SOURCE_DIR}/src/DriverCGNS
@@
-45,7
+46,7
@@
INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS}
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS}
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
${BOOST_DEFINITIONS}
)
@@
-70,11
+71,14
@@
SET(_link_LIBRARIES
${KERNEL_SalomeGenericObj}
${KERNEL_SalomeIDLKERNEL}
${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeGenericObj}
${KERNEL_SalomeIDLKERNEL}
${KERNEL_SALOMELocalTrace}
- ${CAS_TKCDF}
- ${CAS_TKBO}
- ${CAS_TKShHealing}
+ ${KERNEL_SalomeKernelHelpers}
+ ${KERNEL_SalomeDS}
+ ${KERNEL_SalomeCatalog}
+ ${OpenCASCADE_ApplicationFramework_LIBRARIES}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${GEOM_GEOMClient}
${GEOM_GEOMClient}
- ${GEOM_SalomeIDLGEOM}
+ ${GEOM_SalomeIDLGEOM}
+ VTK::IOLegacy
SalomeIDLSMESH
SMESHimpl
SMDS
SalomeIDLSMESH
SMESHimpl
SMDS
@@
-88,6
+92,8
@@
SET(_link_LIBRARIES
# header files / no moc processing
SET(SMESHEngine_HEADERS
SMESH_Gen_i.hxx
# header files / no moc processing
SET(SMESHEngine_HEADERS
SMESH_Gen_i.hxx
+ SMESH_Gen_No_Session_i.hxx
+ SMESH_Gen_Session_i.hxx
SMESH_Algo_i.hxx
SMESH_0D_Algo_i.hxx
SMESH_1D_Algo_i.hxx
SMESH_Algo_i.hxx
SMESH_0D_Algo_i.hxx
SMESH_1D_Algo_i.hxx
@@
-107,6
+113,8
@@
SET(SMESHEngine_HEADERS
SMESH_PreMeshInfo.hxx
SMESH_MeshPartDS.hxx
SMESH.hxx
SMESH_PreMeshInfo.hxx
SMESH_MeshPartDS.hxx
SMESH.hxx
+ SMESH_Component_Generator.hxx
+ MG_ADAPT_i.hxx
)
# --- sources ---
)
# --- sources ---
@@
-115,7
+123,9
@@
SET(SMESHEngine_HEADERS
SET(SMESHEngine_SOURCES
SMESH_Gen_i.cxx
SMESH_Gen_i_1.cxx
SET(SMESHEngine_SOURCES
SMESH_Gen_i.cxx
SMESH_Gen_i_1.cxx
- SMESH_DumpPython.cxx
+ SMESH_Gen_No_Session_i.cxx
+ SMESH_Gen_Session_i.cxx
+ SMESH_PythonDump.cxx
SMESH_Mesh_i.cxx
SMESH_subMesh_i.cxx
SMESH_MeshEditor_i.cxx
SMESH_Mesh_i.cxx
SMESH_subMesh_i.cxx
SMESH_MeshEditor_i.cxx
@@
-132,6
+142,8
@@
SET(SMESHEngine_SOURCES
SMESH_NoteBook.cxx
SMESH_Measurements_i.cxx
SMESH_PreMeshInfo.cxx
SMESH_NoteBook.cxx
SMESH_Measurements_i.cxx
SMESH_PreMeshInfo.cxx
+ SMESH_Component_Generator.cxx
+ MG_ADAPT_i.cxx
)
# --- rules ---
)
# --- rules ---