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
Correcion de programmation - fichiers en python
[modules/smesh.git]
/
src
/
StdMeshers_I
/
CMakeLists.txt
diff --git
a/src/StdMeshers_I/CMakeLists.txt
b/src/StdMeshers_I/CMakeLists.txt
index e1a00be7fc0c403696f116f5ae4aece7b2d33c9e..8dbfc245d102d70e10b42685768b8963958a8d58 100644
(file)
--- a/
src/StdMeshers_I/CMakeLists.txt
+++ b/
src/StdMeshers_I/CMakeLists.txt
@@
-1,9
+1,9
@@
-# Copyright (C) 2012-20
13
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
# License as published by the Free Software Foundation; either
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License
, or (at your option) any later version
.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,16
+20,14
@@
# --- 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
${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/SMESHImpl
- ${PROJECT_SOURCE_DIR}/src/MEFISTO2
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH_I
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH_I
@@
-40,19
+38,29
@@
INCLUDE_DIRECTORIES(
${PROJECT_BINARY_DIR}/idl
)
${PROJECT_BINARY_DIR}/idl
)
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ INCLUDE_DIRECTORIES(
+ ${PROJECT_SOURCE_DIR}/src/MEFISTO2
+ )
+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}
)
+# To avoid GetObject macro definition on WIN32
+IF(WIN32)
+ ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
+
# libraries to link to
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeGenericObj}
# libraries to link to
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeGenericObj}
- ${CAS_TKBRep}
- ${CAS_TKG3d}
+ ${OpenCASCADE_ModelingData_LIBRARIES}
SalomeIDLSMESH
StdMeshers
SMESHEngine
SalomeIDLSMESH
StdMeshers
SMESHEngine
@@
-79,7
+87,6
@@
SET(StdMeshersEngine_HEADERS
StdMeshers_NotConformAllowed_i.hxx
StdMeshers_Regular_1D_i.hxx
StdMeshers_Quadrangle_2D_i.hxx
StdMeshers_NotConformAllowed_i.hxx
StdMeshers_Regular_1D_i.hxx
StdMeshers_Quadrangle_2D_i.hxx
- StdMeshers_MEFISTO_2D_i.hxx
StdMeshers_Hexa_3D_i.hxx
StdMeshers_AutomaticLength_i.hxx
StdMeshers_QuadranglePreference_i.hxx
StdMeshers_Hexa_3D_i.hxx
StdMeshers_AutomaticLength_i.hxx
StdMeshers_QuadranglePreference_i.hxx
@@
-110,16
+117,23
@@
SET(StdMeshersEngine_HEADERS
StdMeshers_ViscousLayers2D_i.hxx
StdMeshers_CartesianParameters3D_i.hxx
StdMeshers_Cartesian_3D_i.hxx
StdMeshers_ViscousLayers2D_i.hxx
StdMeshers_CartesianParameters3D_i.hxx
StdMeshers_Cartesian_3D_i.hxx
+ StdMeshers_PolygonPerFace_2D_i.hxx
+ StdMeshers_PolyhedronPerSolid_3D_i.hxx
+ StdMeshers_BlockRenumber_i.hxx
)
)
-
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ SET(StdMeshersEngine_HEADERS ${StdMeshersEngine_HEADERS} StdMeshers_MEFISTO_2D_i.hxx)
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# --- sources ---
# sources / static
SET(StdMeshersEngine_SOURCES
StdMeshers_i.cxx
StdMeshers_LocalLength_i.cxx
# --- sources ---
# sources / static
SET(StdMeshersEngine_SOURCES
StdMeshers_i.cxx
StdMeshers_LocalLength_i.cxx
+ StdMeshers_Reversible1D_i.cxx
StdMeshers_StartEndLength_i.cxx
StdMeshers_Arithmetic1D_i.cxx
StdMeshers_StartEndLength_i.cxx
StdMeshers_Arithmetic1D_i.cxx
+ StdMeshers_Geometric1D_i.cxx
StdMeshers_FixedPoints1D_i.cxx
StdMeshers_NumberOfSegments_i.cxx
StdMeshers_Deflection1D_i.cxx
StdMeshers_FixedPoints1D_i.cxx
StdMeshers_NumberOfSegments_i.cxx
StdMeshers_Deflection1D_i.cxx
@@
-129,8
+143,7
@@
SET(StdMeshersEngine_SOURCES
StdMeshers_MaxElementVolume_i.cxx
StdMeshers_NotConformAllowed_i.cxx
StdMeshers_Regular_1D_i.cxx
StdMeshers_MaxElementVolume_i.cxx
StdMeshers_NotConformAllowed_i.cxx
StdMeshers_Regular_1D_i.cxx
- StdMeshers_Quadrangle_2D_i.cxx
- StdMeshers_MEFISTO_2D_i.cxx
+ StdMeshers_Quadrangle_2D_i.cxx
StdMeshers_Hexa_3D_i.cxx
StdMeshers_AutomaticLength_i.cxx
StdMeshers_QuadranglePreference_i.cxx
StdMeshers_Hexa_3D_i.cxx
StdMeshers_AutomaticLength_i.cxx
StdMeshers_QuadranglePreference_i.cxx
@@
-160,8
+173,16
@@
SET(StdMeshersEngine_SOURCES
StdMeshers_ViscousLayers2D_i.cxx
StdMeshers_CartesianParameters3D_i.cxx
StdMeshers_Cartesian_3D_i.cxx
StdMeshers_ViscousLayers2D_i.cxx
StdMeshers_CartesianParameters3D_i.cxx
StdMeshers_Cartesian_3D_i.cxx
+ StdMeshers_Adaptive1D_i.cxx
+ StdMeshers_PolygonPerFace_2D_i.cxx
+ StdMeshers_PolyhedronPerSolid_3D_i.cxx
+ StdMeshers_BlockRenumber_i.cxx
)
)
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ SET(StdMeshersEngine_SOURCES ${StdMeshersEngine_SOURCES} StdMeshers_MEFISTO_2D_i.cxx)
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
+
# --- rules ---
ADD_LIBRARY(StdMeshersEngine ${StdMeshersEngine_SOURCES})
# --- rules ---
ADD_LIBRARY(StdMeshersEngine ${StdMeshersEngine_SOURCES})