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
IPAL0054674: Wrong mesh icon after mesh modification
[modules/smesh.git]
/
src
/
StdMeshers_I
/
CMakeLists.txt
diff --git
a/src/StdMeshers_I/CMakeLists.txt
b/src/StdMeshers_I/CMakeLists.txt
index 04e09cfb6445d68254607ffd85d9abb5c01708c0..e4e0f27f46148f86b77846704d6ac895e97fd7a1 100644
(file)
--- a/
src/StdMeshers_I/CMakeLists.txt
+++ b/
src/StdMeshers_I/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
@@
-20,13
+20,12
@@
# --- 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}
${MEDFILE_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${MEDFILE_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/SMESHImpl
${PROJECT_SOURCE_DIR}/src/SMESH
${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/SMESHImpl
${PROJECT_SOURCE_DIR}/src/SMESH
@@
-47,7
+46,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
+60,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
@@
-120,6
+118,7
@@
SET(StdMeshersEngine_HEADERS
StdMeshers_CartesianParameters3D_i.hxx
StdMeshers_Cartesian_3D_i.hxx
StdMeshers_PolygonPerFace_2D_i.hxx
StdMeshers_CartesianParameters3D_i.hxx
StdMeshers_Cartesian_3D_i.hxx
StdMeshers_PolygonPerFace_2D_i.hxx
+ StdMeshers_PolyhedronPerSolid_3D_i.hxx
)
IF(SALOME_SMESH_ENABLE_MEFISTO)
SET(StdMeshersEngine_HEADERS ${StdMeshersEngine_HEADERS} StdMeshers_MEFISTO_2D_i.hxx)
)
IF(SALOME_SMESH_ENABLE_MEFISTO)
SET(StdMeshersEngine_HEADERS ${StdMeshersEngine_HEADERS} StdMeshers_MEFISTO_2D_i.hxx)
@@
-175,6
+174,7
@@
SET(StdMeshersEngine_SOURCES
StdMeshers_Cartesian_3D_i.cxx
StdMeshers_Adaptive1D_i.cxx
StdMeshers_PolygonPerFace_2D_i.cxx
StdMeshers_Cartesian_3D_i.cxx
StdMeshers_Adaptive1D_i.cxx
StdMeshers_PolygonPerFace_2D_i.cxx
+ StdMeshers_PolyhedronPerSolid_3D_i.cxx
)
IF(SALOME_SMESH_ENABLE_MEFISTO)
)
IF(SALOME_SMESH_ENABLE_MEFISTO)