diff --git a/CMakeLists.txt b/CMakeLists.txt index c245df538..ec42958b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,6 +171,11 @@ set(GZ_RENDERING_ENGINE_INSTALL_DIR if(NOT MSVC) #-------------------------------------- # Find CUDA + # Module is being removed in CMake and needs a non trivial + # migration https://cmake.org/cmake/help/latest/policy/CMP0146.html + if(POLICY CMP0146) + cmake_policy(SET CMP0146 OLD) + endif() find_package(CUDA) #-------------------------------------- diff --git a/include/gz/rendering/Camera.hh b/include/gz/rendering/Camera.hh index 91dcbbd5a..6e4303509 100644 --- a/include/gz/rendering/Camera.hh +++ b/include/gz/rendering/Camera.hh @@ -28,6 +28,13 @@ #include "gz/rendering/Sensor.hh" #include "gz/rendering/Scene.hh" +// overloaded-virtuals warnings appeared on Ubuntu Noble +// GCC-13. it is not easy to fix them without breaking ABI +// ignore them to preserve current ABI. +#if defined(__GNUC__) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif namespace gz { @@ -369,4 +376,9 @@ namespace gz } } } + +#if defined(__GNUC__) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + #endif diff --git a/include/gz/rendering/Object.hh b/include/gz/rendering/Object.hh index 90e6ef0aa..573c7edf0 100644 --- a/include/gz/rendering/Object.hh +++ b/include/gz/rendering/Object.hh @@ -22,6 +22,14 @@ #include "gz/rendering/RenderTypes.hh" #include "gz/rendering/Export.hh" +// overloaded-virtuals warnings appeared on Ubuntu Noble +// GCC-13. it is not easy to fix them without breaking ABI +// ignore them to preserve current ABI. +#if defined(__GNUC__) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif + namespace gz { namespace rendering @@ -69,4 +77,9 @@ namespace gz } } } + +#if defined(__GNUC__) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + #endif diff --git a/include/gz/rendering/Visual.hh b/include/gz/rendering/Visual.hh index cfabb3708..809855b9d 100644 --- a/include/gz/rendering/Visual.hh +++ b/include/gz/rendering/Visual.hh @@ -22,6 +22,14 @@ #include "gz/rendering/config.hh" #include "gz/rendering/Node.hh" +// overloaded-virtuals warnings appeared on Ubuntu Noble +// GCC-13. it is not easy to fix them without breaking ABI +// ignore them to preserve current ABI. +#if defined(__GNUC__) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif + namespace gz { namespace rendering @@ -206,4 +214,9 @@ namespace gz } } } + +#if defined(__GNUC__) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + #endif diff --git a/include/gz/rendering/base/BaseRenderTarget.hh b/include/gz/rendering/base/BaseRenderTarget.hh index b7d3da76e..c1ef16a1c 100644 --- a/include/gz/rendering/base/BaseRenderTarget.hh +++ b/include/gz/rendering/base/BaseRenderTarget.hh @@ -25,6 +25,14 @@ #include "gz/rendering/Scene.hh" #include "gz/rendering/base/BaseRenderTypes.hh" +// overloaded-virtuals warnings appeared on Ubuntu Noble +// GCC-13. it is not easy to fix them without breaking ABI +// ignore them to preserve current ABI. +#if defined(__GNUC__) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif + namespace gz { namespace rendering @@ -406,4 +414,9 @@ namespace gz } } } + +#if defined(__GNUC__) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + #endif