Skip to content

Commit

Permalink
clang/gcc/cmake: [skip ci] suppress deprecated-copy warnings for Open…
Browse files Browse the repository at this point in the history
…Inventor class SbMatrix
  • Loading branch information
wwmayer committed Jun 10, 2020
1 parent 6c28152 commit 350bae2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
14 changes: 12 additions & 2 deletions src/Gui/CMakeLists.txt
Expand Up @@ -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})
Expand Down
7 changes: 7 additions & 0 deletions src/Mod/Mesh/Gui/CMakeLists.txt
Expand Up @@ -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})

Expand Down

0 comments on commit 350bae2

Please sign in to comment.