Skip to content

Commit

Permalink
Merge branch 'ament:rolling' into faster_deduplicate
Browse files Browse the repository at this point in the history
  • Loading branch information
VRichardJP authored Feb 13, 2024
2 parents 1aee39a + 6b310f5 commit 3bbbe3c
Show file tree
Hide file tree
Showing 64 changed files with 833 additions and 148 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file was generated by https://github.com/audrow/update-ros2-repos
* @mjeronimo
* @clalancette
18 changes: 18 additions & 0 deletions ament_cmake/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@
Changelog for package ament_cmake
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2023-12-26)
------------------

2.3.1 (2023-11-06)
------------------

2.3.0 (2023-09-07)
------------------

2.2.2 (2023-08-21)
------------------

2.2.1 (2023-06-21)
------------------

2.2.0 (2023-06-07)
------------------

2.1.0 (2023-04-26)
------------------

Expand Down
4 changes: 2 additions & 2 deletions ament_cmake/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>ament_cmake</name>
<version>2.1.0</version>
<version>2.3.2</version>
<description>The entry point package for the ament buildsystem in CMake.</description>

<maintainer email="[email protected]">Michael Jeronimo</maintainer>
<maintainer email="[email protected]">Chris Lalancette</maintainer>

<license>Apache License 2.0</license>

Expand Down
20 changes: 20 additions & 0 deletions ament_cmake_auto/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@
Changelog for package ament_cmake_auto
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2023-12-26)
------------------

2.3.1 (2023-11-06)
------------------
* Add ament_auto_add_gmock to ament_cmake_auto (`#482 <https://github.com/ament/ament_cmake/issues/482>`_)
* Contributors: Jordan Palacios

2.3.0 (2023-09-07)
------------------

2.2.2 (2023-08-21)
------------------

2.2.1 (2023-06-21)
------------------

2.2.0 (2023-06-07)
------------------

2.1.0 (2023-04-26)
------------------

Expand Down
1 change: 1 addition & 0 deletions ament_cmake_auto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.12)
project(ament_cmake_auto NONE)

find_package(ament_cmake REQUIRED)
find_package(ament_cmake_gmock REQUIRED)
find_package(ament_cmake_gtest REQUIRED)

ament_package(
Expand Down
1 change: 1 addition & 0 deletions ament_cmake_auto/ament_cmake_auto-extras.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
find_package(ament_cmake QUIET REQUIRED)

include("${ament_cmake_auto_DIR}/ament_auto_add_executable.cmake")
include("${ament_cmake_auto_DIR}/ament_auto_add_gmock.cmake")
include("${ament_cmake_auto_DIR}/ament_auto_add_gtest.cmake")
include("${ament_cmake_auto_DIR}/ament_auto_add_library.cmake")
include("${ament_cmake_auto_DIR}/ament_auto_generate_code.cmake")
Expand Down
63 changes: 63 additions & 0 deletions ament_cmake_auto/cmake/ament_auto_add_gmock.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Copyright 2023 PAL Robotics S.L.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

#
# Add a gmock with all found test dependencies.
#
# Call add_gmock(target ARGN), link it against the gmock libraries
# and all found test dependencies.
#
# If gmock is not available the specified target is not being created and
# therefore the target existence should be checked before being used.
#
# :param target: the target name which will also be used as the test name
# :type target: string
# :param ARGN: the list of source files and parameters
# :type ARGN: list of strings
#
# @public
#
macro(ament_auto_add_gmock target)
cmake_parse_arguments(_ARG
"SKIP_LINKING_MAIN_LIBRARIES;SKIP_TEST"
"RUNNER;TIMEOUT;WORKING_DIRECTORY"
"APPEND_ENV;APPEND_LIBRARY_DIRS;ENV"
${ARGN})
if(NOT _ARG_UNPARSED_ARGUMENTS)
message(FATAL_ERROR
"ament_auto_add_gmock() must be invoked with at least one source file")
endif()

find_package(ament_cmake_gmock QUIET REQUIRED)

# add gmock
ament_add_gmock("${target}" ${ARGN})

# add include directory of this package if it exists
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_include_directories("${target}" PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/include")
endif()

# link against other libraries of this package
if(NOT ${PROJECT_NAME}_LIBRARIES STREQUAL "")
target_link_libraries("${target}" ${${PROJECT_NAME}_LIBRARIES})
endif()

# add exported information from found dependencies
ament_target_dependencies(${target}
${${PROJECT_NAME}_FOUND_BUILD_DEPENDS}
${${PROJECT_NAME}_FOUND_TEST_DEPENDS}
)
endmacro()
2 changes: 2 additions & 0 deletions ament_cmake_auto/cmake/ament_auto_add_gtest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ macro(ament_auto_add_gtest target)
"ament_auto_add_gtest() must be invoked with at least one source file")
endif()

find_package(ament_cmake_gtest QUIET REQUIRED)

# add executable
set(_arg_executable ${_ARG_UNPARSED_ARGUMENTS})
if(_ARG_SKIP_LINKING_MAIN_LIBRARIES)
Expand Down
6 changes: 4 additions & 2 deletions ament_cmake_auto/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>ament_cmake_auto</name>
<version>2.1.0</version>
<version>2.3.2</version>
<description>The auto-magic functions for ease to use of the ament buildsystem in CMake.</description>

<maintainer email="[email protected]">Michael Jeronimo</maintainer>
<maintainer email="[email protected]">Chris Lalancette</maintainer>

<license>Apache License 2.0</license>

<author>Dirk Thomas</author>
<author email="[email protected]">Michel Hidalgo</author>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake_gmock</buildtool_depend>
<buildtool_depend>ament_cmake_gtest</buildtool_depend>
<buildtool_export_depend>ament_cmake</buildtool_export_depend>
<buildtool_export_depend>ament_cmake_gmock</buildtool_export_depend>
<buildtool_export_depend>ament_cmake_gtest</buildtool_export_depend>

<export>
Expand Down
21 changes: 21 additions & 0 deletions ament_cmake_core/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@
Changelog for package ament_cmake_core
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2023-12-26)
------------------

2.3.1 (2023-11-06)
------------------
* Use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR in ament_generate_environment (`#485 <https://github.com/ament/ament_cmake/issues/485>`_)
* Fix CMake error when entire ament projects are added via add_subdirectory (`#484 <https://github.com/ament/ament_cmake/issues/484>`_)
* Contributors: Silvio Traversaro

2.3.0 (2023-09-07)
------------------

2.2.2 (2023-08-21)
------------------

2.2.1 (2023-06-21)
------------------

2.2.0 (2023-06-07)
------------------

2.1.0 (2023-04-26)
------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ function(ament_generate_environment)
get_filename_component(name "${name}" NAME)
configure_file(
"${file}"
"${CMAKE_BINARY_DIR}/ament_cmake_environment/${name}"
"${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_environment/${name}"
@ONLY
)
set(file "${CMAKE_BINARY_DIR}/ament_cmake_environment/${name}")
set(file "${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_environment/${name}")
endif()

install(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function(ament_environment_hooks)
get_filename_component(hook_basename "${hook}" NAME_WE)
if(DEFINED AMENT_CMAKE_ENVIRONMENT_HOOKS_DESC_${hook_basename})
# write .dsv file containing the descriptor of the environment hook
set(dsv_file "${CMAKE_BINARY_DIR}/ament_cmake_environment_hooks/${hook_basename}.dsv")
set(dsv_file "${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_environment_hooks/${hook_basename}.dsv")
file(GENERATE OUTPUT "${dsv_file}" CONTENT "${AMENT_CMAKE_ENVIRONMENT_HOOKS_DESC_${hook_basename}}\n")
install(
FILES "${dsv_file}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function(ament_generate_package_environment)
endforeach()
endif()
list(APPEND all_package_level_extensions "dsv")
set(dsv_file "${CMAKE_BINARY_DIR}/ament_cmake_environment_hooks/local_setup.dsv")
set(dsv_file "${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_environment_hooks/local_setup.dsv")
file(GENERATE OUTPUT "${dsv_file}" CONTENT "${all_hooks}")
install(
FILES "${dsv_file}"
Expand All @@ -111,7 +111,7 @@ function(ament_generate_package_environment)

# generate package.dsv file
list(SORT all_package_level_extensions)
set(dsv_file "${CMAKE_BINARY_DIR}/ament_cmake_environment_hooks/package.dsv")
set(dsv_file "${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_environment_hooks/package.dsv")
set(dsv_content "")
foreach(ext ${all_package_level_extensions})
set(dsv_content "${dsv_content}source;share/${PROJECT_NAME}/local_setup.${ext}\n")
Expand Down
4 changes: 2 additions & 2 deletions ament_cmake_core/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>ament_cmake_core</name>
<version>2.1.0</version>
<version>2.3.2</version>
<description>
The core of the ament buildsystem in CMake.

Expand All @@ -14,7 +14,7 @@
* symlink_install: use symlinks for CMake install commands
</description>

<maintainer email="[email protected]">Michael Jeronimo</maintainer>
<maintainer email="[email protected]">Chris Lalancette</maintainer>

<license>Apache License 2.0</license>

Expand Down
18 changes: 18 additions & 0 deletions ament_cmake_export_definitions/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@
Changelog for package ament_cmake_export_definitions
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2023-12-26)
------------------

2.3.1 (2023-11-06)
------------------

2.3.0 (2023-09-07)
------------------

2.2.2 (2023-08-21)
------------------

2.2.1 (2023-06-21)
------------------

2.2.0 (2023-06-07)
------------------

2.1.0 (2023-04-26)
------------------

Expand Down
4 changes: 2 additions & 2 deletions ament_cmake_export_definitions/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>ament_cmake_export_definitions</name>
<version>2.1.0</version>
<version>2.3.2</version>
<description>The ability to export definitions to downstream packages in the ament buildsystem.</description>

<maintainer email="[email protected]">Michael Jeronimo</maintainer>
<maintainer email="[email protected]">Chris Lalancette</maintainer>

<license>Apache License 2.0</license>

Expand Down
18 changes: 18 additions & 0 deletions ament_cmake_export_dependencies/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@
Changelog for package ament_cmake_export_dependencies
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2023-12-26)
------------------

2.3.1 (2023-11-06)
------------------

2.3.0 (2023-09-07)
------------------

2.2.2 (2023-08-21)
------------------

2.2.1 (2023-06-21)
------------------

2.2.0 (2023-06-07)
------------------

2.1.0 (2023-04-26)
------------------

Expand Down
4 changes: 2 additions & 2 deletions ament_cmake_export_dependencies/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>ament_cmake_export_dependencies</name>
<version>2.1.0</version>
<version>2.3.2</version>
<description>The ability to export dependencies to downstream packages in the ament buildsystem in CMake.</description>

<maintainer email="[email protected]">Michael Jeronimo</maintainer>
<maintainer email="[email protected]">Chris Lalancette</maintainer>

<license>Apache License 2.0</license>

Expand Down
18 changes: 18 additions & 0 deletions ament_cmake_export_include_directories/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@
Changelog for package ament_cmake_export_include_directories
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2023-12-26)
------------------

2.3.1 (2023-11-06)
------------------

2.3.0 (2023-09-07)
------------------

2.2.2 (2023-08-21)
------------------

2.2.1 (2023-06-21)
------------------

2.2.0 (2023-06-07)
------------------

2.1.0 (2023-04-26)
------------------

Expand Down
4 changes: 2 additions & 2 deletions ament_cmake_export_include_directories/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>ament_cmake_export_include_directories</name>
<version>2.1.0</version>
<version>2.3.2</version>
<description>The ability to export include directories to downstream packages in the ament buildsystem in CMake.</description>

<maintainer email="[email protected]">Michael Jeronimo</maintainer>
<maintainer email="[email protected]">Chris Lalancette</maintainer>

<license>Apache License 2.0</license>

Expand Down
Loading

0 comments on commit 3bbbe3c

Please sign in to comment.