From 350bae2aa74ba0d93c2206d895719de578ff9818 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 10 Jun 2020 12:49:45 +0200 Subject: [PATCH] clang/gcc/cmake: [skip ci] suppress deprecated-copy warnings for OpenInventor class SbMatrix --- src/Gui/CMakeLists.txt | 14 ++++++++++++-- src/Mod/Mesh/Gui/CMakeLists.txt | 7 +++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 96c05a7234cc..e317e4ec81f1 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -1345,9 +1345,19 @@ if (FREECAD_USE_QT_FILEDIALOG) set_source_files_properties(FileDialog.cpp PROPERTIES COMPILE_FLAGS -DUSE_QT_FILEDIALOG) endif() -# Suppress some very long Eigen3 warnings of older versions +# Suppress some very long Eigen3 warnings of older versions and +# suppress this warning for the SbMatrix class if (EIGEN3_NO_DEPRECATED_COPY) - set_source_files_properties(NaviCube.cpp PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY}) + set_source_files_properties( + NaviCube.cpp + Inventor/SoAutoZoomTranslation.cpp + SoFCOffscreenRenderer.cpp + SoFCSelectionAction.cpp + SoNavigationDragger.cpp + SoFCCSysDragger.cpp + Quarter/QuarterWidget.cpp + View3DInventorViewer.cpp + PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY}) endif () add_library(FreeCADGui SHARED ${FreeCADGui_SRCS}) diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 45dfd95be052..c0850c563abd 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -170,6 +170,13 @@ SET(MeshGuiIcon_SVG Resources/icons/MeshWorkbench.svg ) +# Suppress this warning for the SbMatrix class +if (EIGEN3_NO_DEPRECATED_COPY) + set_source_files_properties( + SoFCIndexedFaceSet.cpp + PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY}) +endif () + add_library(MeshGui SHARED ${MeshGui_SRCS} ${MeshGuiIcon_SVG}) target_link_libraries(MeshGui ${MeshGui_LIBS})