Skip to content

Commit

Permalink
port: 5 to main (#594)
Browse files Browse the repository at this point in the history
* Various Bazel adjustments for linting (#582)

Signed-off-by: Michael Carroll <[email protected]>

* Prepare for 5.5.1 (#586)

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Adds new function in MeshManager for performing convex decomposition (#585)


Signed-off-by: Ian Chen <[email protected]>

* Add new function in MeshManager to merge all submeshes of a mesh into one (#588)



---------

Signed-off-by: Ian Chen <[email protected]>

* Fix bazel build (#592)

Signed-off-by: Shameek Ganguly <[email protected]>

* Remove pessimizing move (#593)

Signed-off-by: Shameek Ganguly <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Shameek Ganguly <[email protected]>

---------

Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Shameek Ganguly <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: shameekganguly <[email protected]>
  • Loading branch information
4 people authored Apr 11, 2024
1 parent 149339c commit 6dae728
Show file tree
Hide file tree
Showing 10 changed files with 143 additions and 2 deletions.
20 changes: 19 additions & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,24 @@ load(
"gz_export_header",
"gz_include_header",
)
load(
"@gz//bazel/lint:lint.bzl",
"add_lint_tests",
)
load("@rules_license//rules:license.bzl", "license")

package(
default_applicable_licenses = [GZ_ROOT + "common:license"],
default_visibility = GZ_VISIBILITY,
features = GZ_FEATURES,
)

licenses(["notice"]) # Apache-2.0
license(
name = "license",
package_name = "gz-common",
)

licenses(["notice"])

exports_files(["LICENSE"])

Expand Down Expand Up @@ -67,6 +78,10 @@ cc_library(
name = "common",
srcs = sources + private_headers,
hdrs = public_headers,
copts = [
"-fexceptions",
"-Wno-unused-value",
],
includes = ["include"],
deps = [
GZ_ROOT + "utils",
Expand All @@ -86,10 +101,13 @@ test_sources = glob(
[cc_test(
name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
srcs = [src],
copts = ["-fexceptions"],
deps = [
":common",
GZ_ROOT + "common/testing",
"@gtest",
"@gtest//:gtest_main",
],
) for src in test_sources]

add_lint_tests()
11 changes: 11 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@

## Gazebo Common 5.x

## Gazebo Common 5.5.1 (2024-03-14)

1. Various Bazel adjustments for linting
* [Pull request #582](https://github.com/gazebosim/gz-common/pull/582)

1. Extend AssimpLoader to parse material transmission factor
* [Pull request #577](https://github.com/gazebosim/gz-common/pull/577)

1. Fix noise issue that appears in certain image textures
* [Pull request #578](https://github.com/gazebosim/gz-common/pull/578)

## Gazebo Common 5.5.0 (2024-02-26)

1. Be louder when graphics is missing for geospatial
Expand Down
12 changes: 12 additions & 0 deletions av/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
load(
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_ROOT",
"GZ_VISIBILITY",
"gz_export_header",
"gz_include_header",
)
load(
"@gz//bazel/lint:lint.bzl",
"add_lint_tests",
)

package(
default_applicable_licenses = [GZ_ROOT + "common:license"],
features = GZ_FEATURES,
)

public_headers_no_gen = glob([
"include/gz/common/*.hh",
Expand Down Expand Up @@ -68,3 +78,5 @@ cc_library(
"@gtest//:gtest_main",
],
) for src in test_sources]

add_lint_tests()
12 changes: 12 additions & 0 deletions events/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
load(
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_ROOT",
"GZ_VISIBILITY",
"gz_export_header",
"gz_include_header",
)
load(
"@gz//bazel/lint:lint.bzl",
"add_lint_tests",
)

package(
default_applicable_licenses = [GZ_ROOT + "common:license"],
features = GZ_FEATURES,
)

public_headers_no_gen = glob([
"include/gz/common/*.hh",
Expand Down Expand Up @@ -59,3 +69,5 @@ cc_library(
"@gtest//:gtest_main",
],
) for src in test_sources]

add_lint_tests()
16 changes: 16 additions & 0 deletions geospatial/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
load(
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_ROOT",
"GZ_VISIBILITY",
"gz_export_header",
"gz_include_header",
)
load(
"@gz//bazel/lint:lint.bzl",
"add_lint_tests",
)

package(
default_applicable_licenses = [GZ_ROOT + "common:license"],
features = GZ_FEATURES,
)

public_headers_no_gen = glob([
"include/gz/common/*.hh",
Expand Down Expand Up @@ -42,6 +52,10 @@ cc_library(
name = "geospatial",
srcs = sources,
hdrs = public_headers,
copts = [
"-Wno-unused-value",
"-fexceptions",
],
includes = ["include"],
visibility = GZ_VISIBILITY,
deps = [
Expand All @@ -66,3 +80,5 @@ cc_library(
"@gtest//:gtest_main",
],
) for src in test_sources]

add_lint_tests()
20 changes: 19 additions & 1 deletion graphics/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@
load(
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_ROOT",
"GZ_VISIBILITY",
"gz_export_header",
"gz_include_header",
)
load(
"@gz//bazel/lint:lint.bzl",
"add_lint_tests",
)

package(
default_applicable_licenses = [GZ_ROOT + "common:license"],
features = GZ_FEATURES,
)

public_headers_no_gen = glob([
"include/gz/common/*.hh",
"include/gz/common/**/*.hh",
])

private_headers = glob(["src/VHACD/*.h"])

sources = glob(
["src/*.cc"],
exclude = ["src/*_TEST.cc"],
Expand Down Expand Up @@ -41,8 +53,12 @@ public_headers = public_headers_no_gen + [

cc_library(
name = "graphics",
srcs = sources,
srcs = sources + private_headers,
hdrs = public_headers,
copts = [
"-Wno-implicit-fallthrough",
"-Wno-unused-value",
],
includes = ["include"],
visibility = GZ_VISIBILITY,
deps = [
Expand Down Expand Up @@ -70,3 +86,5 @@ cc_library(
"@gtest//:gtest_main",
],
) for src in test_sources]

add_lint_tests()
15 changes: 15 additions & 0 deletions io/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
load(
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_ROOT",
"GZ_VISIBILITY",
"gz_export_header",
"gz_include_header",
)
load(
"@gz//bazel/lint:lint.bzl",
"add_lint_tests",
)

package(
default_applicable_licenses = [GZ_ROOT + "common:license"],
features = GZ_FEATURES,
)

public_headers_no_gen = glob([
"include/gz/common/*.hh",
Expand Down Expand Up @@ -42,6 +52,9 @@ cc_library(
name = "io",
srcs = sources,
hdrs = public_headers,
copts = [
"-fexceptions",
],
includes = ["include"],
visibility = GZ_VISIBILITY,
deps = [
Expand All @@ -63,3 +76,5 @@ cc_library(
"@gtest//:gtest_main",
],
) for src in test_sources]

add_lint_tests()
13 changes: 13 additions & 0 deletions profiler/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
load(
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_ROOT",
"GZ_VISIBILITY",
"cmake_configure_file",
"gz_export_header",
"gz_include_header",
)
load(
"@gz//bazel/lint:lint.bzl",
"add_lint_tests",
)

package(
default_applicable_licenses = [GZ_ROOT + "common:license"],
features = GZ_FEATURES,
)

# Configuration for UNIX
RMT_ENABLED = 1
Expand Down Expand Up @@ -97,6 +107,7 @@ cc_library(
cc_test(
name = "Profiler_Disabled_TEST",
srcs = ["src/Profiler_Disabled_TEST.cc"],
copts = ["-Wno-macro-redefined"],
defines = [
"GZ_PROFILER_ENABLE=0",
"GZ_PROFILER_REMOTERY=0",
Expand All @@ -117,3 +128,5 @@ cc_test(
"@gtest//:gtest_main",
],
)

add_lint_tests()
13 changes: 13 additions & 0 deletions test/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
load(
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_ROOT",
)
load(
"@gz//bazel/lint:lint.bzl",
"add_lint_tests",
)

package(
default_applicable_licenses = [GZ_ROOT + "common:license"],
features = GZ_FEATURES,
)

cc_test(
name = "INTEGRATION_console",
Expand Down Expand Up @@ -35,8 +45,11 @@ cc_test(
GZ_ROOT + "common",
GZ_ROOT + "common/graphics",
GZ_ROOT + "common/testing",
GZ_ROOT + "math",
"@gtest//:gtest_main",
],
)

exports_files(["data"])

add_lint_tests()
13 changes: 13 additions & 0 deletions testing/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
load(
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_ROOT",
"gz_export_header",
)
load(
"@gz//bazel/lint:lint.bzl",
"add_lint_tests",
)

package(
default_applicable_licenses = [GZ_ROOT + "common:license"],
features = GZ_FEATURES,
)

gz_export_header(
name = "include/gz/common/testing/Export.hh",
Expand All @@ -25,6 +35,7 @@ cc_library(
"src/Utils.cc",
],
hdrs = public_headers,
copts = ["-fexceptions"],
includes = ["include"],
visibility = ["//visibility:public"],
deps = [
Expand Down Expand Up @@ -67,3 +78,5 @@ cc_test(
"@gtest//:gtest_main",
],
)

add_lint_tests()

0 comments on commit 6dae728

Please sign in to comment.