From 9c3ef8e39614f7479108dac3d874359948aa9b34 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 11 Dec 2023 19:56:16 +0000 Subject: [PATCH] Fix install directory Signed-off-by: Michael Carroll --- BUILD.bazel | 8 ++++++++ include/gz/physics/config.hh.in | 1 + 2 files changed, 9 insertions(+) diff --git a/BUILD.bazel b/BUILD.bazel index b6e3c3fce..e1bfb499c 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -22,6 +22,11 @@ gz_configure_header( src = "include/gz/physics/config.hh.in", cmakelists = ["CMakeLists.txt"], package = "physics", + defines = { + # These definitions are unused, + # this is merely to suppress generator warnings + "GZ_PHYSICS_ENGINE_INSTALL_DIR": "unused", + }, ) gz_export_header( @@ -69,6 +74,9 @@ cc_library( GZ_ROOT + "plugin:loader", GZ_ROOT + "utils", ], + defines = [ + 'GZ_PHYSICS_ENGINE_RELATIVE_INSTALL_DIR=\\"unused\\"', + ], ) cc_library( diff --git a/include/gz/physics/config.hh.in b/include/gz/physics/config.hh.in index d0c68462d..332fb10e4 100644 --- a/include/gz/physics/config.hh.in +++ b/include/gz/physics/config.hh.in @@ -27,6 +27,7 @@ #define GZ_PHYSICS_VERSION "${PROJECT_VERSION}" #define GZ_PHYSICS_VERSION_FULL "${PROJECT_VERSION_FULL}" +#define GZ_PHYSICS_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR} #define GZ_PHYSICS_ENGINE_INSTALL_DIR _Pragma ("GCC warning \"'GZ_PHYSICS_ENGINE_INSTALL_DIR' macro is deprecated, use gz::physics::getEngineInstallDir() function instead. \"") "${GZ_PHYSICS_ENGINE_INSTALL_DIR}"