Skip to content

Commit 9f397e1

Browse files
authored
Workaround on warnings for Ubuntu Noble (#995)
* Add pragma ignores for Woverloaded-virtual * Ignore the warning on FindCUDA removal --------- Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
1 parent 69f56bd commit 9f397e1

File tree

5 files changed

+56
-0
lines changed

5 files changed

+56
-0
lines changed

CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ set(GZ_RENDERING_ENGINE_INSTALL_DIR
171171
if(NOT MSVC)
172172
#--------------------------------------
173173
# Find CUDA
174+
# Module is being removed in CMake and needs a non trivial
175+
# migration https://cmake.org/cmake/help/latest/policy/CMP0146.html
176+
if(POLICY CMP0146)
177+
cmake_policy(SET CMP0146 OLD)
178+
endif()
174179
find_package(CUDA)
175180

176181
#--------------------------------------

include/gz/rendering/Camera.hh

+12
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@
2828
#include "gz/rendering/Sensor.hh"
2929
#include "gz/rendering/Scene.hh"
3030

31+
// overloaded-virtuals warnings appeared on Ubuntu Noble
32+
// GCC-13. it is not easy to fix them without breaking ABI
33+
// ignore them to preserve current ABI.
34+
#if defined(__GNUC__) || defined(__clang__)
35+
# pragma GCC diagnostic push
36+
# pragma GCC diagnostic ignored "-Woverloaded-virtual"
37+
#endif
3138

3239
namespace gz
3340
{
@@ -369,4 +376,9 @@ namespace gz
369376
}
370377
}
371378
}
379+
380+
#if defined(__GNUC__) || defined(__clang__)
381+
# pragma GCC diagnostic pop
382+
#endif
383+
372384
#endif

include/gz/rendering/Object.hh

+13
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
#include "gz/rendering/RenderTypes.hh"
2323
#include "gz/rendering/Export.hh"
2424

25+
// overloaded-virtuals warnings appeared on Ubuntu Noble
26+
// GCC-13. it is not easy to fix them without breaking ABI
27+
// ignore them to preserve current ABI.
28+
#if defined(__GNUC__) || defined(__clang__)
29+
# pragma GCC diagnostic push
30+
# pragma GCC diagnostic ignored "-Woverloaded-virtual"
31+
#endif
32+
2533
namespace gz
2634
{
2735
namespace rendering
@@ -69,4 +77,9 @@ namespace gz
6977
}
7078
}
7179
}
80+
81+
#if defined(__GNUC__) || defined(__clang__)
82+
# pragma GCC diagnostic pop
83+
#endif
84+
7285
#endif

include/gz/rendering/Visual.hh

+13
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
#include "gz/rendering/config.hh"
2323
#include "gz/rendering/Node.hh"
2424

25+
// overloaded-virtuals warnings appeared on Ubuntu Noble
26+
// GCC-13. it is not easy to fix them without breaking ABI
27+
// ignore them to preserve current ABI.
28+
#if defined(__GNUC__) || defined(__clang__)
29+
# pragma GCC diagnostic push
30+
# pragma GCC diagnostic ignored "-Woverloaded-virtual"
31+
#endif
32+
2533
namespace gz
2634
{
2735
namespace rendering
@@ -206,4 +214,9 @@ namespace gz
206214
}
207215
}
208216
}
217+
218+
#if defined(__GNUC__) || defined(__clang__)
219+
# pragma GCC diagnostic pop
220+
#endif
221+
209222
#endif

include/gz/rendering/base/BaseRenderTarget.hh

+13
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@
2525
#include "gz/rendering/Scene.hh"
2626
#include "gz/rendering/base/BaseRenderTypes.hh"
2727

28+
// overloaded-virtuals warnings appeared on Ubuntu Noble
29+
// GCC-13. it is not easy to fix them without breaking ABI
30+
// ignore them to preserve current ABI.
31+
#if defined(__GNUC__) || defined(__clang__)
32+
# pragma GCC diagnostic push
33+
# pragma GCC diagnostic ignored "-Woverloaded-virtual"
34+
#endif
35+
2836
namespace gz
2937
{
3038
namespace rendering
@@ -406,4 +414,9 @@ namespace gz
406414
}
407415
}
408416
}
417+
418+
#if defined(__GNUC__) || defined(__clang__)
419+
# pragma GCC diagnostic pop
420+
#endif
421+
409422
#endif

0 commit comments

Comments
 (0)