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
[bos #40650][CEA 33012] Beta Law distribution: added a new type of distribution for...
[modules/smesh.git]
/
src
/
SMESH
/
CMakeLists.txt
diff --git
a/src/SMESH/CMakeLists.txt
b/src/SMESH/CMakeLists.txt
index e96f78f1ba598b8c2d62f05e4432deff4240a5bf..a9d9e8ad8219d7de45455fa029a17d46fd0a0176 100644
(file)
--- a/
src/SMESH/CMakeLists.txt
+++ b/
src/SMESH/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2012-20
24 CEA, EDF
, 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,12
+20,13
@@
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
+ ${QT_INCLUDES}
${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
- ${CAS_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
+ ${OpenCASCADE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
+ ${TBB_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/MEDWrapper
${PROJECT_SOURCE_DIR}/src/Driver
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/MEDWrapper
${PROJECT_SOURCE_DIR}/src/Driver
@@
-38,11
+39,12
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESHUtils
+ ${MEDCOUPLING_INCLUDE_DIRS}
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
${BOOST_DEFINITIONS}
)
@@
-53,10
+55,9
@@
ENDIF(SALOME_SMESH_USE_CGNS)
# libraries to link to
SET(_link_LIBRARIES
# libraries to link to
SET(_link_LIBRARIES
- ${CAS_TKShHealing}
- ${CAS_TKPrim}
- ${CAS_TKG2d}
- ${CAS_TKCDF}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+ ${OpenCASCADE_ModelingData_LIBRARIES}
+ ${OpenCASCADE_ApplicationFramework_LIBRARIES}
${GEOM_NMTTools}
${GEOM_GEOMUtils}
${Boost_LIBRARIES}
${GEOM_NMTTools}
${GEOM_GEOMUtils}
${Boost_LIBRARIES}
@@
-68,6
+69,8
@@
SET(_link_LIBRARIES
MeshDriverUNV
MeshDriverGMF
${DriverCGNS_LIB}
MeshDriverUNV
MeshDriverGMF
${DriverCGNS_LIB}
+ ${MEDCoupling_medloader}
+ Qt5::Core
)
# --- headers ---
)
# --- headers ---
@@
-76,6
+79,8
@@
SET(_link_LIBRARIES
SET(SMESHimpl_HEADERS
SMESH_Gen.hxx
SMESH_Mesh.hxx
SET(SMESHimpl_HEADERS
SMESH_Gen.hxx
SMESH_Mesh.hxx
+ SMESH_SequentialMesh.hxx
+ SMESH_ParallelMesh.hxx
SMESH_subMesh.hxx
SMESH_subMeshEventListener.hxx
SMESH_Hypothesis.hxx
SMESH_subMesh.hxx
SMESH_subMeshEventListener.hxx
SMESH_Hypothesis.hxx
@@
-87,6
+92,11
@@
SET(SMESHimpl_HEADERS
SMESH_MesherHelper.hxx
SMESH_ProxyMesh.hxx
SMESH_SMESH.hxx
SMESH_MesherHelper.hxx
SMESH_ProxyMesh.hxx
SMESH_SMESH.hxx
+ MG_ADAPT.hxx
+ SMESH_Homard.hxx
+ SMESH_DriverMesh.hxx
+ SMESH_DriverShape.hxx
+ SMESH_MeshLocker.hxx
)
# --- sources ---
)
# --- sources ---
@@
-96,6
+106,8
@@
SET(SMESHimpl_SOURCES
memoire.h
SMESH_Gen.cxx
SMESH_Mesh.cxx
memoire.h
SMESH_Gen.cxx
SMESH_Mesh.cxx
+ SMESH_SequentialMesh.cxx
+ SMESH_ParallelMesh.cxx
SMESH_subMesh.cxx
SMESH_Hypothesis.cxx
SMESH_Algo.cxx
SMESH_subMesh.cxx
SMESH_Hypothesis.cxx
SMESH_Algo.cxx
@@
-105,11
+117,21
@@
SET(SMESHimpl_SOURCES
SMESH_HypoFilter.cxx
SMESH_ProxyMesh.cxx
SMESH_MesherHelper.cxx
SMESH_HypoFilter.cxx
SMESH_ProxyMesh.cxx
SMESH_MesherHelper.cxx
+ MG_ADAPT.cxx
+ SMESH_Homard.cxx
+ SMESH_DriverMesh.cxx
+ SMESH_DriverShape.cxx
+ SMESH_MeshLocker.cxx
)
# --- rules ---
ADD_LIBRARY(SMESHimpl ${SMESHimpl_SOURCES})
)
# --- rules ---
ADD_LIBRARY(SMESHimpl ${SMESHimpl_SOURCES})
+IF(WIN32)
+ TARGET_COMPILE_OPTIONS(SMESHimpl PRIVATE /bigobj)
+ ADD_DEFINITIONS(-DNOMINMAX)
+ENDIF(WIN32)
+
TARGET_LINK_LIBRARIES(SMESHimpl ${_link_LIBRARIES} )
INSTALL(TARGETS SMESHimpl EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
TARGET_LINK_LIBRARIES(SMESHimpl ${_link_LIBRARIES} )
INSTALL(TARGETS SMESHimpl EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})