Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix linter and use <depend> for underlying package. #1

Merged
merged 1 commit into from Mar 21, 2024
Merged

Fix linter and use <depend> for underlying package. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Expand Up @@ -2,15 +2,15 @@ Any contribution that you make to this repository will
be under the Apache 2 License, as dictated by that
[license](http://www.apache.org/licenses/LICENSE-2.0.html):

~~
~~~
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
~~
~~~

Contributors must sign-off each commit by adding a `Signed-off-by: ...`
line to commit messages to certify that they have the right to submit
Expand Down
4 changes: 2 additions & 2 deletions gz_msgs_vendor-extras.cmake.in
View file
Open in desktop
Expand Up @@ -9,12 +9,12 @@ get_target_property(components @LIB_NAME@@LIB_VER_MAJOR@::requested INTERFACE_LI

foreach(component ${components})
# Skip the core library
if (${component} STREQUAL @LIB_NAME@@LIB_VER_MAJOR@::@LIB_NAME@@LIB_VER_MAJOR@)
if(${component} STREQUAL @LIB_NAME@@LIB_VER_MAJOR@::@LIB_NAME@@LIB_VER_MAJOR@)
continue()
endif()

# Skip the -all target
if (${component} STREQUAL @LIB_NAME@@LIB_VER_MAJOR@::@LIB_NAME@@LIB_VER_MAJOR@-all)
if(${component} STREQUAL @LIB_NAME@@LIB_VER_MAJOR@::@LIB_NAME@@LIB_VER_MAJOR@-all)
continue()
endif()

Expand Down
2 changes: 1 addition & 1 deletion package.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<depend>gz_tools_vendor</depend>

<!-- Depend on the package we are vendoring to allow building it from source -->
<build_depend condition="$GZ_BUILD_FROM_SOURCE != ''">gz-msgs10</build_depend>
<depend condition="$GZ_BUILD_FROM_SOURCE != ''">gz-msgs10</depend>

<test_depend>ament_cmake_copyright</test_depend>
<test_depend>ament_cmake_lint_cmake</test_depend>
Expand Down