Merge pull request #535 from gazebosim/nkoenig/7-to-main-05122023

Nkoenig/7 to main 05122023

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     name: Ubuntu Focal CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@focal
@@ -22,7 +22,7 @@ jobs:
     name: Ubuntu Jammy CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@jammy

BUILD.bazel

@@ -1,37 +1,31 @@
 load(
-    "//gz_bazel:build_defs.bzl",
+    "@gz//bazel/skylark:build_defs.bzl",
     "GZ_FEATURES",
+    "GZ_ROOT",
     "GZ_VISIBILITY",
-    "cmake_configure_file",
-    "generate_include_header",
-    "gz_config_header",
+    "gz_configure_header",
     "gz_export_header",
+    "gz_include_header",
+)
+load(
+    "@gz//bazel/lint:lint.bzl",
+    "add_lint_tests",
 )
 
 package(
     default_visibility = GZ_VISIBILITY,
     features = GZ_FEATURES,
 )
 
-licenses(["notice"])
+licenses(["notice"])  # Apache-2.0
 
 exports_files(["LICENSE"])
 
-PROJECT_NAME = "gz-math"
-
-PROJECT_MAJOR = 8
-
-PROJECT_MINOR = 0
-
-PROJECT_PATCH = 0
-
-# Generates config.hh based on the version numbers in CMake code.
-gz_config_header(
+gz_configure_header(
     name = "config",
     src = "include/gz/math/config.hh.in",
     cmakelists = ["CMakeLists.txt"],
-    project_name = PROJECT_NAME,
-    project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
+    package = "math",
 )
 
 gz_export_header(
@@ -54,7 +48,7 @@ sources = glob(
     exclude = ["src/*_TEST.cc"],
 )
 
-generate_include_header(
+gz_include_header(
     name = "mathhh_genrule",
     out = "include/gz/math.hh",
     hdrs = public_headers_no_gen + [
@@ -70,34 +64,30 @@ public_headers = public_headers_no_gen + [
 ]
 
 cc_library(
-    name = "gz_math",
+    name = "math",
     srcs = sources + private_headers,
     hdrs = public_headers,
     includes = ["include"],
+    deps = [
+        GZ_ROOT + "utils",
+    ],
 )
 
-# use shared library only when absolutely needd
-cc_binary(
-    name = "libgz-math8.so",
-    includes = ["include"],
-    linkopts = ["-Wl,-soname,libgz-math8.so"],
-    linkshared = True,
-    deps = [
-        ":gz_math",
+test_sources = glob(
+    [
+        "src/*_TEST.cc",
+        "src/graph/*_TEST.cc",
     ],
 )
 
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
     deps = [
-        ":gz_math",
+        ":math",
         "@gtest",
         "@gtest//:gtest_main",
     ],
-) for src in glob(
-    [
-        "src/*_TEST.cc",
-        "src/graph/*_TEST.cc",
-    ],
-)]
+) for src in test_sources]
+
+add_lint_tests()

CMakeLists.txt

@@ -27,9 +27,14 @@ option(SKIP_SWIG
       "Skip generating ruby bindings via Swig"
       OFF)
 
+set(skip_pybind11_default_value OFF)
+if (MSVC)
+  set(skip_pybind11_default_value ON)
+endif()
+
 option(SKIP_PYBIND11
       "Skip generating Python bindings via pybind11"
-      OFF)
+      ${skip_pybind11_default_value})
 
 include(CMakeDependentOption)
 cmake_dependent_option(USE_SYSTEM_PATHS_FOR_RUBY_INSTALLATION

Changelog.md

@@ -217,6 +217,14 @@
 
 ## Gazebo Math 6.x
 
+## Gazebo Math 6.13.0 (2022-08-31)
+
+1. Support migration and migrate headers
+    * [Pull request #483](https://github.com/gazebosim/gz-math/pull/483)
+
+1. Remove redundant namespace references
+    * [Pull request #479](https://github.com/gazebosim/gz-math/pull/479)
+
 ## Gazebo Math 6.12.0 (2022-07-27)
 
 1. Added Helper function isTimeString to Python