From 77c1dd758dc65f80bd6644ec80261c0f3bfa6f7f Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Wed, 24 May 2023 15:15:03 -0700 Subject: [PATCH 01/25] Add support for specifying a patch directory in ament_vendor (#449) In cases where we have more than one patch for a project, it can be cleaner to put the patches in a subdirectory and apply all of them alphabetically rather than list them explicitly. Signed-off-by: Scott K Logan --- ament_cmake_vendor_package/cmake/ament_vendor.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ament_cmake_vendor_package/cmake/ament_vendor.cmake b/ament_cmake_vendor_package/cmake/ament_vendor.cmake index 01622d18..b7fd969f 100644 --- a/ament_cmake_vendor_package/cmake/ament_vendor.cmake +++ b/ament_cmake_vendor_package/cmake/ament_vendor.cmake @@ -30,7 +30,9 @@ # code at. # :type VCS_VERSION: string # :param PATCHES: paths to patch files to apply to downloaded source code, -# either absolute or relative to the current calling directory. +# either absolute or relative to the current calling directory. If given a +# directory, all patch files in the directory (non-recursive) will be applied +# in alphabetical order. # :type PATCHES: list of strings # :param CMAKE_ARGS: extra arguments to pass to the CMake invocation of the # external project. @@ -154,6 +156,10 @@ function(_ament_vendor TARGET_NAME VCS_TYPE VCS_URL VCS_VERSION PATCHES CMAKE_AR if(NOT EXISTS ${PATCH}) message(FATAL_ERROR "ament_vendor() could not find patch file: ${PATCH}") endif() + if(IS_DIRECTORY ${PATCH}) + file(GLOB PATCH LIST_DIRECTORIES FALSE "${PATCH}/*.patch" "${PATCH}/*.diff") + list(SORT PATCH) + endif() list(APPEND PATCH_FILES ${PATCH}) endforeach() From e43622033e69c198f722ae43f9c4fdadb0ae91df Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Wed, 7 Jun 2023 14:13:27 +0000 Subject: [PATCH 02/25] Changelog. Signed-off-by: Chris Lalancette --- ament_cmake/CHANGELOG.rst | 3 +++ ament_cmake_auto/CHANGELOG.rst | 3 +++ ament_cmake_core/CHANGELOG.rst | 3 +++ ament_cmake_export_definitions/CHANGELOG.rst | 3 +++ ament_cmake_export_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_export_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_export_interfaces/CHANGELOG.rst | 3 +++ ament_cmake_export_libraries/CHANGELOG.rst | 3 +++ ament_cmake_export_link_flags/CHANGELOG.rst | 3 +++ ament_cmake_export_targets/CHANGELOG.rst | 3 +++ ament_cmake_gen_version_h/CHANGELOG.rst | 3 +++ ament_cmake_gmock/CHANGELOG.rst | 3 +++ ament_cmake_google_benchmark/CHANGELOG.rst | 3 +++ ament_cmake_gtest/CHANGELOG.rst | 3 +++ ament_cmake_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_libraries/CHANGELOG.rst | 3 +++ ament_cmake_pytest/CHANGELOG.rst | 3 +++ ament_cmake_python/CHANGELOG.rst | 3 +++ ament_cmake_target_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_test/CHANGELOG.rst | 3 +++ ament_cmake_vendor_package/CHANGELOG.rst | 5 +++++ ament_cmake_version/CHANGELOG.rst | 3 +++ 22 files changed, 68 insertions(+) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index ef11918e..ea23c033 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index 2842eef5..73b663c5 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index c8b62702..0ffeec4f 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index 0d1821ad..5ac31b42 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index b3784127..e49063d0 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index d40e11bf..5a667aa3 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index cb5b897c..3c1e0f84 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index 4c41aa4a..d25af35f 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index 7923bee2..aba67dfb 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index 81e29ff1..3a9fbc25 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index c8687a00..b249fbea 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index 25b8b038..6b270688 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index ac4f7531..a5d999b0 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index ca8dd6fd..c79fa285 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index 9a4f285b..01d1afdb 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index d26f6b00..513ef8ef 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index 0afc6443..5ed9dade 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index 4701a8d1..e603a918 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index efe64fc9..fc2b4b76 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index bda41f84..70b35a05 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index 0f60c5f7..113cf878 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Add support for specifying a patch directory in ament_vendor (`#449 `_) +* Contributors: Scott K Logan + 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index b8a5daef..d106ac8e 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.1.0 (2023-04-26) ------------------ From c064cdb8462eaccb56ef4372b2642293cae11d89 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Wed, 7 Jun 2023 14:13:37 +0000 Subject: [PATCH 03/25] 2.2.0 --- ament_cmake/CHANGELOG.rst | 4 ++-- ament_cmake/package.xml | 2 +- ament_cmake_auto/CHANGELOG.rst | 4 ++-- ament_cmake_auto/package.xml | 2 +- ament_cmake_core/CHANGELOG.rst | 4 ++-- ament_cmake_core/package.xml | 2 +- ament_cmake_export_definitions/CHANGELOG.rst | 4 ++-- ament_cmake_export_definitions/package.xml | 2 +- ament_cmake_export_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_export_dependencies/package.xml | 2 +- ament_cmake_export_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_export_include_directories/package.xml | 2 +- ament_cmake_export_interfaces/CHANGELOG.rst | 4 ++-- ament_cmake_export_interfaces/package.xml | 2 +- ament_cmake_export_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_export_libraries/package.xml | 2 +- ament_cmake_export_link_flags/CHANGELOG.rst | 4 ++-- ament_cmake_export_link_flags/package.xml | 2 +- ament_cmake_export_targets/CHANGELOG.rst | 4 ++-- ament_cmake_export_targets/package.xml | 2 +- ament_cmake_gen_version_h/CHANGELOG.rst | 4 ++-- ament_cmake_gen_version_h/package.xml | 2 +- ament_cmake_gmock/CHANGELOG.rst | 4 ++-- ament_cmake_gmock/package.xml | 2 +- ament_cmake_google_benchmark/CHANGELOG.rst | 4 ++-- ament_cmake_google_benchmark/package.xml | 2 +- ament_cmake_gtest/CHANGELOG.rst | 4 ++-- ament_cmake_gtest/package.xml | 2 +- ament_cmake_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_include_directories/package.xml | 2 +- ament_cmake_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_libraries/package.xml | 2 +- ament_cmake_pytest/CHANGELOG.rst | 4 ++-- ament_cmake_pytest/package.xml | 2 +- ament_cmake_python/CHANGELOG.rst | 4 ++-- ament_cmake_python/package.xml | 2 +- ament_cmake_target_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_target_dependencies/package.xml | 2 +- ament_cmake_test/CHANGELOG.rst | 4 ++-- ament_cmake_test/package.xml | 2 +- ament_cmake_vendor_package/CHANGELOG.rst | 4 ++-- ament_cmake_vendor_package/package.xml | 2 +- ament_cmake_version/CHANGELOG.rst | 4 ++-- ament_cmake_version/package.xml | 2 +- 44 files changed, 66 insertions(+), 66 deletions(-) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index ea23c033..a5b5a5b8 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake/package.xml b/ament_cmake/package.xml index 29c6d041..c995059e 100644 --- a/ament_cmake/package.xml +++ b/ament_cmake/package.xml @@ -2,7 +2,7 @@ ament_cmake - 2.1.0 + 2.2.0 The entry point package for the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index 73b663c5..c1826fbf 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_auto/package.xml b/ament_cmake_auto/package.xml index c2f6d5b6..8e7a50a9 100644 --- a/ament_cmake_auto/package.xml +++ b/ament_cmake_auto/package.xml @@ -2,7 +2,7 @@ ament_cmake_auto - 2.1.0 + 2.2.0 The auto-magic functions for ease to use of the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index 0ffeec4f..2cd5d3cb 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_core/package.xml b/ament_cmake_core/package.xml index 3bf5739b..bfd20ac7 100644 --- a/ament_cmake_core/package.xml +++ b/ament_cmake_core/package.xml @@ -2,7 +2,7 @@ ament_cmake_core - 2.1.0 + 2.2.0 The core of the ament buildsystem in CMake. diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index 5ac31b42..1aa5980f 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_definitions/package.xml b/ament_cmake_export_definitions/package.xml index c7a12249..ef22007e 100644 --- a/ament_cmake_export_definitions/package.xml +++ b/ament_cmake_export_definitions/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_definitions - 2.1.0 + 2.2.0 The ability to export definitions to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index e49063d0..720f1dee 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_dependencies/package.xml b/ament_cmake_export_dependencies/package.xml index 3fb81688..c08b8d1b 100644 --- a/ament_cmake_export_dependencies/package.xml +++ b/ament_cmake_export_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_dependencies - 2.1.0 + 2.2.0 The ability to export dependencies to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index 5a667aa3..f9380cec 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_include_directories/package.xml b/ament_cmake_export_include_directories/package.xml index 968879bf..7ae72158 100644 --- a/ament_cmake_export_include_directories/package.xml +++ b/ament_cmake_export_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_include_directories - 2.1.0 + 2.2.0 The ability to export include directories to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index 3c1e0f84..e32a0c78 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_interfaces/package.xml b/ament_cmake_export_interfaces/package.xml index 0a1e05dc..e8006a12 100644 --- a/ament_cmake_export_interfaces/package.xml +++ b/ament_cmake_export_interfaces/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_interfaces - 2.1.0 + 2.2.0 The ability to export interfaces to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index d25af35f..e5f7aec7 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_libraries/package.xml b/ament_cmake_export_libraries/package.xml index 9ddfb4e5..58ee9450 100644 --- a/ament_cmake_export_libraries/package.xml +++ b/ament_cmake_export_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_libraries - 2.1.0 + 2.2.0 The ability to export libraries to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index aba67dfb..cdb7a944 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_link_flags/package.xml b/ament_cmake_export_link_flags/package.xml index 1298deb0..8e23fc46 100644 --- a/ament_cmake_export_link_flags/package.xml +++ b/ament_cmake_export_link_flags/package.xml @@ -1,7 +1,7 @@ ament_cmake_export_link_flags - 2.1.0 + 2.2.0 The ability to export link flags to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index 3a9fbc25..4306d046 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_export_targets/package.xml b/ament_cmake_export_targets/package.xml index 017ce1dc..a90a98ef 100644 --- a/ament_cmake_export_targets/package.xml +++ b/ament_cmake_export_targets/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_targets - 2.1.0 + 2.2.0 The ability to export targets to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index b249fbea..e1ecb2a7 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_gen_version_h/package.xml b/ament_cmake_gen_version_h/package.xml index 9dfb8636..f4b5ac1f 100644 --- a/ament_cmake_gen_version_h/package.xml +++ b/ament_cmake_gen_version_h/package.xml @@ -2,7 +2,7 @@ ament_cmake_gen_version_h - 2.1.0 + 2.2.0 Generate a C header containing the version number of the package Michael Jeronimo diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index 6b270688..d72160ee 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_gmock/package.xml b/ament_cmake_gmock/package.xml index c750069e..05e2507b 100644 --- a/ament_cmake_gmock/package.xml +++ b/ament_cmake_gmock/package.xml @@ -2,7 +2,7 @@ ament_cmake_gmock - 2.1.0 + 2.2.0 The ability to add Google mock-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index a5d999b0..c2f98531 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_google_benchmark/package.xml b/ament_cmake_google_benchmark/package.xml index 574d3933..b4eee959 100644 --- a/ament_cmake_google_benchmark/package.xml +++ b/ament_cmake_google_benchmark/package.xml @@ -2,7 +2,7 @@ ament_cmake_google_benchmark - 2.1.0 + 2.2.0 The ability to add Google Benchmark tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index c79fa285..b77f7a6e 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_gtest/package.xml b/ament_cmake_gtest/package.xml index 2e3fdf57..f706c64a 100644 --- a/ament_cmake_gtest/package.xml +++ b/ament_cmake_gtest/package.xml @@ -2,7 +2,7 @@ ament_cmake_gtest - 2.1.0 + 2.2.0 The ability to add gtest-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index 01d1afdb..bf33dbca 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_include_directories/package.xml b/ament_cmake_include_directories/package.xml index 759227e7..14179d5d 100644 --- a/ament_cmake_include_directories/package.xml +++ b/ament_cmake_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_include_directories - 2.1.0 + 2.2.0 The functionality to order include directories according to a chain of prefixes in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index 513ef8ef..eb65caca 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_libraries/package.xml b/ament_cmake_libraries/package.xml index 9fab0abe..15c1720f 100644 --- a/ament_cmake_libraries/package.xml +++ b/ament_cmake_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_libraries - 2.1.0 + 2.2.0 The functionality to deduplicate libraries in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index 5ed9dade..e902ce25 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_pytest/package.xml b/ament_cmake_pytest/package.xml index 1d157f0b..c54b02cf 100644 --- a/ament_cmake_pytest/package.xml +++ b/ament_cmake_pytest/package.xml @@ -2,7 +2,7 @@ ament_cmake_pytest - 2.1.0 + 2.2.0 The ability to run Python tests using pytest in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index e603a918..9d1fa62e 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_python/package.xml b/ament_cmake_python/package.xml index 7931b4a3..738c9b01 100644 --- a/ament_cmake_python/package.xml +++ b/ament_cmake_python/package.xml @@ -2,7 +2,7 @@ ament_cmake_python - 2.1.0 + 2.2.0 The ability to use Python in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index fc2b4b76..31485926 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_target_dependencies/package.xml b/ament_cmake_target_dependencies/package.xml index 50299a6b..813ee6ce 100644 --- a/ament_cmake_target_dependencies/package.xml +++ b/ament_cmake_target_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_target_dependencies - 2.1.0 + 2.2.0 The ability to add definitions, include directories and libraries of a package to a target in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index 70b35a05..417ce0f2 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_test/package.xml b/ament_cmake_test/package.xml index ae2eb882..160a6a8e 100644 --- a/ament_cmake_test/package.xml +++ b/ament_cmake_test/package.xml @@ -2,7 +2,7 @@ ament_cmake_test - 2.1.0 + 2.2.0 The ability to add tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index 113cf878..04aa5afa 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ * Add support for specifying a patch directory in ament_vendor (`#449 `_) * Contributors: Scott K Logan diff --git a/ament_cmake_vendor_package/package.xml b/ament_cmake_vendor_package/package.xml index a9b973d1..5904c8f4 100644 --- a/ament_cmake_vendor_package/package.xml +++ b/ament_cmake_vendor_package/package.xml @@ -2,7 +2,7 @@ ament_cmake_vendor_package - 2.1.0 + 2.2.0 Macros for maintaining a 'vendor' package. Michael Jeronimo diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index d106ac8e..7757030a 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.0 (2023-06-07) +------------------ 2.1.0 (2023-04-26) ------------------ diff --git a/ament_cmake_version/package.xml b/ament_cmake_version/package.xml index f4201d75..122a6618 100644 --- a/ament_cmake_version/package.xml +++ b/ament_cmake_version/package.xml @@ -2,7 +2,7 @@ ament_cmake_version - 2.1.0 + 2.2.0 The ability to override the exported package version in the ament buildsystem. Michael Jeronimo From 448647d990b0e836837b2eae0645531b0baf7d92 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Fri, 16 Jun 2023 10:05:20 -0700 Subject: [PATCH 04/25] ament_cmake_vendor_package: Replace 'git' dep with 'vcstool' (#462) At some point in development, I switched from 'git' to 'vcstool' for fetching sources and forgot to update the manifest. Signed-off-by: Scott K Logan --- ament_cmake_vendor_package/package.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ament_cmake_vendor_package/package.xml b/ament_cmake_vendor_package/package.xml index 5904c8f4..cb4cee8b 100644 --- a/ament_cmake_vendor_package/package.xml +++ b/ament_cmake_vendor_package/package.xml @@ -13,10 +13,10 @@ ament_cmake_core ament_cmake_export_dependencies - ament_cmake_export_dependencies + ament_cmake_export_dependencies ament_cmake_core - git + python3-vcstool ament_cmake_test From 75a74e2b993c1e70395cf972b51f0d2f049263dc Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 20 Jun 2023 07:34:23 -0700 Subject: [PATCH 05/25] ament_cmake_vendor_package: Switch to CMake 'braket arguments' (#461) This syntax behaves like a verbatim text block. Previously, escape sequences and characters which require escaping which were present in any of these variables could result in a broken configuration. Signed-off-by: Scott K Logan --- .../cmake/ament_vendor.cmake | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ament_cmake_vendor_package/cmake/ament_vendor.cmake b/ament_cmake_vendor_package/cmake/ament_vendor.cmake index b7fd969f..4910e9d3 100644 --- a/ament_cmake_vendor_package/cmake/ament_vendor.cmake +++ b/ament_cmake_vendor_package/cmake/ament_vendor.cmake @@ -186,64 +186,64 @@ function(_ament_vendor TARGET_NAME VCS_TYPE VCS_URL VCS_VERSION PATCHES CMAKE_AR set(CMAKE_ARGS_FILE "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}-config.cmake") if(DEFINED CMAKE_TOOLCHAIN_FILE) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_TOOLCHAIN_FILE \"${CMAKE_TOOLCHAIN_FILE}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_TOOLCHAIN_FILE [=[${CMAKE_TOOLCHAIN_FILE}]=] CACHE INTERNAL \"\")") if(ANDROID) if(DEFINED ANDROID_ABI) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_ABI \"${ANDROID_ABI}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_ABI [=[${ANDROID_ABI}]=] CACHE INTERNAL \"\")") endif() if(DEFINED ANDROID_CPP_FEATURES) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_CPP_FEATURES \"${ANDROID_CPP_FEATURES}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_CPP_FEATURES [=[${ANDROID_CPP_FEATURES}]=] CACHE INTERNAL \"\")") endif() if(DEFINED ANDROID_FUNCTION_LEVEL_LINKING) set(CMAKE_ARGS_CONTENT - "${CMAKE_ARGS_CONTENT}\nset(ANDROID_FUNCTION_LEVEL_LINKING \"${ANDROID_FUNCTION_LEVEL_LINKING}\" CACHE INTERNAL \"\")") + "${CMAKE_ARGS_CONTENT}\nset(ANDROID_FUNCTION_LEVEL_LINKING [=[${ANDROID_FUNCTION_LEVEL_LINKING}]=] CACHE INTERNAL \"\")") endif() if(DEFINED ANDROID_NATIVE_API_LEVEL) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_NATIVE_API_LEVEL \"${ANDROID_NATIVE_API_LEVEL}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_NATIVE_API_LEVEL [=[${ANDROID_NATIVE_API_LEVEL}]=] CACHE INTERNAL \"\")") endif() if(DEFINED ANDROID_NDK) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_NDK \"${ANDROID_NDK}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_NDK [=[${ANDROID_NDK}]=] CACHE INTERNAL \"\")") endif() if(DEFINED ANDROID_STL) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_STL \"${ANDROID_STL}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_STL [=[${ANDROID_STL}]=] CACHE INTERNAL \"\")") endif() if(DEFINED ANDROID_TOOLCHAIN_NAME) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_TOOLCHAIN_NAME \"${ANDROID_TOOLCHAIN_NAME}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_TOOLCHAIN_NAME [=[${ANDROID_TOOLCHAIN_NAME}]=] CACHE INTERNAL \"\")") endif() endif() else() if(DEFINED CMAKE_C_COMPILER) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_C_COMPILER [=[${CMAKE_C_COMPILER}]=] CACHE INTERNAL \"\")") endif() if(DEFINED CMAKE_CXX_COMPILER) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_CXX_COMPILER [=[${CMAKE_CXX_COMPILER}]=] CACHE INTERNAL \"\")") endif() endif() if(DEFINED CMAKE_C_FLAGS) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_C_FLAGS [=[${CMAKE_C_FLAGS}]=] CACHE INTERNAL \"\")") endif() if(DEFINED CMAKE_CXX_FLAGS) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_CXX_FLAGS [=[${CMAKE_CXX_FLAGS}]=] CACHE INTERNAL \"\")") endif() if(DEFINED CMAKE_VERBOSE_MAKEFILE) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_VERBOSE_MAKEFILE \"${CMAKE_VERBOSE_MAKEFILE}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_VERBOSE_MAKEFILE [=[${CMAKE_VERBOSE_MAKEFILE}]=] CACHE INTERNAL \"\")") endif() if(DEFINED CMAKE_BUILD_TYPE) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_BUILD_TYPE [=[${CMAKE_BUILD_TYPE}]=] CACHE INTERNAL \"\")") endif() list(PREPEND CMAKE_PREFIX_PATH ${_AMENT_CMAKE_VENDOR_PACKAGE_PREFIX_PATH}) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_PREFIX_PATH \"${CMAKE_PREFIX_PATH}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_PREFIX_PATH [=[${CMAKE_PREFIX_PATH}]=] CACHE INTERNAL \"\")") set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(BUILD_TESTING \"OFF\" CACHE INTERNAL \"\")") if(DEFINED BUILD_SHARED_LIBS) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(BUILD_SHARED_LIBS \"${BUILD_SHARED_LIBS}\" CACHE INTERNAL \"\")") + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(BUILD_SHARED_LIBS [=[${BUILD_SHARED_LIBS}]=] CACHE INTERNAL \"\")") else() set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(BUILD_SHARED_LIBS ON CACHE BOOL \"\")") endif() From b11f8312796a0437328c7566dd4112ea6bbb6de2 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Wed, 21 Jun 2023 09:01:22 -0700 Subject: [PATCH 06/25] 2.2.1 --- ament_cmake/CHANGELOG.rst | 3 +++ ament_cmake/package.xml | 2 +- ament_cmake_auto/CHANGELOG.rst | 3 +++ ament_cmake_auto/package.xml | 2 +- ament_cmake_core/CHANGELOG.rst | 3 +++ ament_cmake_core/package.xml | 2 +- ament_cmake_export_definitions/CHANGELOG.rst | 3 +++ ament_cmake_export_definitions/package.xml | 2 +- ament_cmake_export_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_export_dependencies/package.xml | 2 +- ament_cmake_export_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_export_include_directories/package.xml | 2 +- ament_cmake_export_interfaces/CHANGELOG.rst | 3 +++ ament_cmake_export_interfaces/package.xml | 2 +- ament_cmake_export_libraries/CHANGELOG.rst | 3 +++ ament_cmake_export_libraries/package.xml | 2 +- ament_cmake_export_link_flags/CHANGELOG.rst | 3 +++ ament_cmake_export_link_flags/package.xml | 2 +- ament_cmake_export_targets/CHANGELOG.rst | 3 +++ ament_cmake_export_targets/package.xml | 2 +- ament_cmake_gen_version_h/CHANGELOG.rst | 3 +++ ament_cmake_gen_version_h/package.xml | 2 +- ament_cmake_gmock/CHANGELOG.rst | 3 +++ ament_cmake_gmock/package.xml | 2 +- ament_cmake_google_benchmark/CHANGELOG.rst | 3 +++ ament_cmake_google_benchmark/package.xml | 2 +- ament_cmake_gtest/CHANGELOG.rst | 3 +++ ament_cmake_gtest/package.xml | 2 +- ament_cmake_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_include_directories/package.xml | 2 +- ament_cmake_libraries/CHANGELOG.rst | 3 +++ ament_cmake_libraries/package.xml | 2 +- ament_cmake_pytest/CHANGELOG.rst | 3 +++ ament_cmake_pytest/package.xml | 2 +- ament_cmake_python/CHANGELOG.rst | 3 +++ ament_cmake_python/package.xml | 2 +- ament_cmake_target_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_target_dependencies/package.xml | 2 +- ament_cmake_test/CHANGELOG.rst | 3 +++ ament_cmake_test/package.xml | 2 +- ament_cmake_vendor_package/CHANGELOG.rst | 6 ++++++ ament_cmake_vendor_package/package.xml | 2 +- ament_cmake_version/CHANGELOG.rst | 3 +++ ament_cmake_version/package.xml | 2 +- 44 files changed, 91 insertions(+), 22 deletions(-) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index a5b5a5b8..0ad6c4b5 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake/package.xml b/ament_cmake/package.xml index c995059e..781b1790 100644 --- a/ament_cmake/package.xml +++ b/ament_cmake/package.xml @@ -2,7 +2,7 @@ ament_cmake - 2.2.0 + 2.2.1 The entry point package for the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index c1826fbf..55f075c4 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_auto/package.xml b/ament_cmake_auto/package.xml index 8e7a50a9..3adf8fce 100644 --- a/ament_cmake_auto/package.xml +++ b/ament_cmake_auto/package.xml @@ -2,7 +2,7 @@ ament_cmake_auto - 2.2.0 + 2.2.1 The auto-magic functions for ease to use of the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index 2cd5d3cb..836f5d40 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_core/package.xml b/ament_cmake_core/package.xml index bfd20ac7..fadff616 100644 --- a/ament_cmake_core/package.xml +++ b/ament_cmake_core/package.xml @@ -2,7 +2,7 @@ ament_cmake_core - 2.2.0 + 2.2.1 The core of the ament buildsystem in CMake. diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index 1aa5980f..6ea74ae4 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_export_definitions/package.xml b/ament_cmake_export_definitions/package.xml index ef22007e..6aae70a3 100644 --- a/ament_cmake_export_definitions/package.xml +++ b/ament_cmake_export_definitions/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_definitions - 2.2.0 + 2.2.1 The ability to export definitions to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index 720f1dee..e88f0605 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_export_dependencies/package.xml b/ament_cmake_export_dependencies/package.xml index c08b8d1b..d36c6578 100644 --- a/ament_cmake_export_dependencies/package.xml +++ b/ament_cmake_export_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_dependencies - 2.2.0 + 2.2.1 The ability to export dependencies to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index f9380cec..1e012638 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_export_include_directories/package.xml b/ament_cmake_export_include_directories/package.xml index 7ae72158..255c67c9 100644 --- a/ament_cmake_export_include_directories/package.xml +++ b/ament_cmake_export_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_include_directories - 2.2.0 + 2.2.1 The ability to export include directories to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index e32a0c78..7e73a82f 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_export_interfaces/package.xml b/ament_cmake_export_interfaces/package.xml index e8006a12..d1f318f4 100644 --- a/ament_cmake_export_interfaces/package.xml +++ b/ament_cmake_export_interfaces/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_interfaces - 2.2.0 + 2.2.1 The ability to export interfaces to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index e5f7aec7..fbe919c0 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_export_libraries/package.xml b/ament_cmake_export_libraries/package.xml index 58ee9450..7a3ad3ce 100644 --- a/ament_cmake_export_libraries/package.xml +++ b/ament_cmake_export_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_libraries - 2.2.0 + 2.2.1 The ability to export libraries to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index cdb7a944..54ab8d7e 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_export_link_flags/package.xml b/ament_cmake_export_link_flags/package.xml index 8e23fc46..c7002252 100644 --- a/ament_cmake_export_link_flags/package.xml +++ b/ament_cmake_export_link_flags/package.xml @@ -1,7 +1,7 @@ ament_cmake_export_link_flags - 2.2.0 + 2.2.1 The ability to export link flags to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index 4306d046..d1a18173 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_export_targets/package.xml b/ament_cmake_export_targets/package.xml index a90a98ef..96a086cd 100644 --- a/ament_cmake_export_targets/package.xml +++ b/ament_cmake_export_targets/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_targets - 2.2.0 + 2.2.1 The ability to export targets to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index e1ecb2a7..ed3822f3 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_gen_version_h/package.xml b/ament_cmake_gen_version_h/package.xml index f4b5ac1f..faa9b7b4 100644 --- a/ament_cmake_gen_version_h/package.xml +++ b/ament_cmake_gen_version_h/package.xml @@ -2,7 +2,7 @@ ament_cmake_gen_version_h - 2.2.0 + 2.2.1 Generate a C header containing the version number of the package Michael Jeronimo diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index d72160ee..555d109f 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_gmock/package.xml b/ament_cmake_gmock/package.xml index 05e2507b..e3e21025 100644 --- a/ament_cmake_gmock/package.xml +++ b/ament_cmake_gmock/package.xml @@ -2,7 +2,7 @@ ament_cmake_gmock - 2.2.0 + 2.2.1 The ability to add Google mock-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index c2f98531..b86f9968 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_google_benchmark/package.xml b/ament_cmake_google_benchmark/package.xml index b4eee959..97596441 100644 --- a/ament_cmake_google_benchmark/package.xml +++ b/ament_cmake_google_benchmark/package.xml @@ -2,7 +2,7 @@ ament_cmake_google_benchmark - 2.2.0 + 2.2.1 The ability to add Google Benchmark tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index b77f7a6e..d2cf7bf6 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_gtest/package.xml b/ament_cmake_gtest/package.xml index f706c64a..7c491023 100644 --- a/ament_cmake_gtest/package.xml +++ b/ament_cmake_gtest/package.xml @@ -2,7 +2,7 @@ ament_cmake_gtest - 2.2.0 + 2.2.1 The ability to add gtest-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index bf33dbca..5bbaa4e0 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_include_directories/package.xml b/ament_cmake_include_directories/package.xml index 14179d5d..ed52e9ab 100644 --- a/ament_cmake_include_directories/package.xml +++ b/ament_cmake_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_include_directories - 2.2.0 + 2.2.1 The functionality to order include directories according to a chain of prefixes in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index eb65caca..bc771009 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_libraries/package.xml b/ament_cmake_libraries/package.xml index 15c1720f..5c96d796 100644 --- a/ament_cmake_libraries/package.xml +++ b/ament_cmake_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_libraries - 2.2.0 + 2.2.1 The functionality to deduplicate libraries in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index e902ce25..0e93b65d 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_pytest/package.xml b/ament_cmake_pytest/package.xml index c54b02cf..9c0c9f56 100644 --- a/ament_cmake_pytest/package.xml +++ b/ament_cmake_pytest/package.xml @@ -2,7 +2,7 @@ ament_cmake_pytest - 2.2.0 + 2.2.1 The ability to run Python tests using pytest in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index 9d1fa62e..8c75c6ab 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_python/package.xml b/ament_cmake_python/package.xml index 738c9b01..f16233c3 100644 --- a/ament_cmake_python/package.xml +++ b/ament_cmake_python/package.xml @@ -2,7 +2,7 @@ ament_cmake_python - 2.2.0 + 2.2.1 The ability to use Python in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index 31485926..c785aec8 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_target_dependencies/package.xml b/ament_cmake_target_dependencies/package.xml index 813ee6ce..3eec498a 100644 --- a/ament_cmake_target_dependencies/package.xml +++ b/ament_cmake_target_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_target_dependencies - 2.2.0 + 2.2.1 The ability to add definitions, include directories and libraries of a package to a target in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index 417ce0f2..7b991669 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_test/package.xml b/ament_cmake_test/package.xml index 160a6a8e..be8b40e5 100644 --- a/ament_cmake_test/package.xml +++ b/ament_cmake_test/package.xml @@ -2,7 +2,7 @@ ament_cmake_test - 2.2.0 + 2.2.1 The ability to add tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index 04aa5afa..67baca28 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,6 +2,12 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ +* Switch to CMake 'braket arguments' (`#461 `_) +* Replace 'git' dep with 'vcstool' (`#462 `_) +* Contributors: Scott K Logan + 2.2.0 (2023-06-07) ------------------ * Add support for specifying a patch directory in ament_vendor (`#449 `_) diff --git a/ament_cmake_vendor_package/package.xml b/ament_cmake_vendor_package/package.xml index cb4cee8b..880d3239 100644 --- a/ament_cmake_vendor_package/package.xml +++ b/ament_cmake_vendor_package/package.xml @@ -2,7 +2,7 @@ ament_cmake_vendor_package - 2.2.0 + 2.2.1 Macros for maintaining a 'vendor' package. Michael Jeronimo diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index 7757030a..627a2abd 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.1 (2023-06-21) +------------------ + 2.2.0 (2023-06-07) ------------------ diff --git a/ament_cmake_version/package.xml b/ament_cmake_version/package.xml index 122a6618..878d743b 100644 --- a/ament_cmake_version/package.xml +++ b/ament_cmake_version/package.xml @@ -2,7 +2,7 @@ ament_cmake_version - 2.2.0 + 2.2.1 The ability to override the exported package version in the ament buildsystem. Michael Jeronimo From c0bd2912c50d743fdda9e37ce3b481fc1efa8ca0 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 3 Aug 2023 21:42:45 +0900 Subject: [PATCH 07/25] Fix `ament_target_dependencies` (#452) CMake `find_library` does not do anything if the input variable is already set. Signed-off-by: Vincent Richard --- .../cmake/ament_target_dependencies.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ament_cmake_target_dependencies/cmake/ament_target_dependencies.cmake b/ament_cmake_target_dependencies/cmake/ament_target_dependencies.cmake index 50bb69c7..946ebcc6 100644 --- a/ament_cmake_target_dependencies/cmake/ament_target_dependencies.cmake +++ b/ament_cmake_target_dependencies/cmake/ament_target_dependencies.cmake @@ -113,6 +113,7 @@ function(ament_target_dependencies target) foreach(library ${${package_name}_LIBRARIES}) if(NOT "${${package_name}_LIBRARY_DIRS}" STREQUAL "") if(NOT IS_ABSOLUTE ${library} OR NOT EXISTS ${library}) + unset(lib CACHE) find_library(lib NAMES ${library} PATHS ${${package_name}_LIBRARY_DIRS} NO_DEFAULT_PATH) if(lib) set(library ${lib}) From 09595706820f2916930b8366f26b0055ed5df140 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 10 Aug 2023 05:32:38 -0700 Subject: [PATCH 08/25] Always set CMAKE_C[XX]_COMPILER for vendor packages if needed (#476) Signed-off-by: Christophe Bedard --- .../cmake/ament_vendor.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ament_cmake_vendor_package/cmake/ament_vendor.cmake b/ament_cmake_vendor_package/cmake/ament_vendor.cmake index 4910e9d3..631b540d 100644 --- a/ament_cmake_vendor_package/cmake/ament_vendor.cmake +++ b/ament_cmake_vendor_package/cmake/ament_vendor.cmake @@ -211,14 +211,14 @@ function(_ament_vendor TARGET_NAME VCS_TYPE VCS_URL VCS_VERSION PATCHES CMAKE_AR set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(ANDROID_TOOLCHAIN_NAME [=[${ANDROID_TOOLCHAIN_NAME}]=] CACHE INTERNAL \"\")") endif() endif() - else() - if(DEFINED CMAKE_C_COMPILER) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_C_COMPILER [=[${CMAKE_C_COMPILER}]=] CACHE INTERNAL \"\")") - endif() + endif() - if(DEFINED CMAKE_CXX_COMPILER) - set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_CXX_COMPILER [=[${CMAKE_CXX_COMPILER}]=] CACHE INTERNAL \"\")") - endif() + if(DEFINED CMAKE_C_COMPILER) + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_C_COMPILER [=[${CMAKE_C_COMPILER}]=] CACHE INTERNAL \"\")") + endif() + + if(DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_ARGS_CONTENT "${CMAKE_ARGS_CONTENT}\nset(CMAKE_CXX_COMPILER [=[${CMAKE_CXX_COMPILER}]=] CACHE INTERNAL \"\")") endif() if(DEFINED CMAKE_C_FLAGS) From 5a40ca6d262cd91e41fe4a7dc1879b1c9515dd75 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Mon, 21 Aug 2023 15:25:00 +0000 Subject: [PATCH 09/25] Changelog. Signed-off-by: Chris Lalancette --- ament_cmake/CHANGELOG.rst | 3 +++ ament_cmake_auto/CHANGELOG.rst | 3 +++ ament_cmake_core/CHANGELOG.rst | 3 +++ ament_cmake_export_definitions/CHANGELOG.rst | 3 +++ ament_cmake_export_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_export_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_export_interfaces/CHANGELOG.rst | 3 +++ ament_cmake_export_libraries/CHANGELOG.rst | 3 +++ ament_cmake_export_link_flags/CHANGELOG.rst | 3 +++ ament_cmake_export_targets/CHANGELOG.rst | 3 +++ ament_cmake_gen_version_h/CHANGELOG.rst | 3 +++ ament_cmake_gmock/CHANGELOG.rst | 3 +++ ament_cmake_google_benchmark/CHANGELOG.rst | 3 +++ ament_cmake_gtest/CHANGELOG.rst | 3 +++ ament_cmake_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_libraries/CHANGELOG.rst | 3 +++ ament_cmake_pytest/CHANGELOG.rst | 3 +++ ament_cmake_python/CHANGELOG.rst | 3 +++ ament_cmake_target_dependencies/CHANGELOG.rst | 5 +++++ ament_cmake_test/CHANGELOG.rst | 3 +++ ament_cmake_vendor_package/CHANGELOG.rst | 5 +++++ ament_cmake_version/CHANGELOG.rst | 3 +++ 22 files changed, 70 insertions(+) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index 0ad6c4b5..dbe3062c 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index 55f075c4..f9e16afd 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index 836f5d40..3938b62d 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index 6ea74ae4..a6a0a0ae 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index e88f0605..33e346ea 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index 1e012638..e803e82c 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index 7e73a82f..75403101 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index fbe919c0..a13900b8 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index 54ab8d7e..afb744ab 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index d1a18173..9293fa9e 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index ed3822f3..f15bd77e 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index 555d109f..a2d3baa1 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index b86f9968..94bf2301 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index d2cf7bf6..a094cd28 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index 5bbaa4e0..c04db18b 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index bc771009..a52779c6 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index 0e93b65d..89eda131 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index 8c75c6ab..9b6a42fe 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index c785aec8..068262b2 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Fix `ament_target_dependencies` (`#452 `_) +* Contributors: Vincent Richard + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index 7b991669..7da67bc3 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index 67baca28..c70d7e34 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Always set CMAKE_C[XX]_COMPILER for vendor packages if needed (`#476 `_) +* Contributors: Christophe Bedard + 2.2.1 (2023-06-21) ------------------ * Switch to CMake 'braket arguments' (`#461 `_) diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index 627a2abd..7b24cc7a 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.1 (2023-06-21) ------------------ From 92afd90c3c97ce67e4608f387c07327a986edc22 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Mon, 21 Aug 2023 15:25:18 +0000 Subject: [PATCH 10/25] 2.2.2 --- ament_cmake/CHANGELOG.rst | 4 ++-- ament_cmake/package.xml | 2 +- ament_cmake_auto/CHANGELOG.rst | 4 ++-- ament_cmake_auto/package.xml | 2 +- ament_cmake_core/CHANGELOG.rst | 4 ++-- ament_cmake_core/package.xml | 2 +- ament_cmake_export_definitions/CHANGELOG.rst | 4 ++-- ament_cmake_export_definitions/package.xml | 2 +- ament_cmake_export_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_export_dependencies/package.xml | 2 +- ament_cmake_export_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_export_include_directories/package.xml | 2 +- ament_cmake_export_interfaces/CHANGELOG.rst | 4 ++-- ament_cmake_export_interfaces/package.xml | 2 +- ament_cmake_export_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_export_libraries/package.xml | 2 +- ament_cmake_export_link_flags/CHANGELOG.rst | 4 ++-- ament_cmake_export_link_flags/package.xml | 2 +- ament_cmake_export_targets/CHANGELOG.rst | 4 ++-- ament_cmake_export_targets/package.xml | 2 +- ament_cmake_gen_version_h/CHANGELOG.rst | 4 ++-- ament_cmake_gen_version_h/package.xml | 2 +- ament_cmake_gmock/CHANGELOG.rst | 4 ++-- ament_cmake_gmock/package.xml | 2 +- ament_cmake_google_benchmark/CHANGELOG.rst | 4 ++-- ament_cmake_google_benchmark/package.xml | 2 +- ament_cmake_gtest/CHANGELOG.rst | 4 ++-- ament_cmake_gtest/package.xml | 2 +- ament_cmake_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_include_directories/package.xml | 2 +- ament_cmake_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_libraries/package.xml | 2 +- ament_cmake_pytest/CHANGELOG.rst | 4 ++-- ament_cmake_pytest/package.xml | 2 +- ament_cmake_python/CHANGELOG.rst | 4 ++-- ament_cmake_python/package.xml | 2 +- ament_cmake_target_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_target_dependencies/package.xml | 2 +- ament_cmake_test/CHANGELOG.rst | 4 ++-- ament_cmake_test/package.xml | 2 +- ament_cmake_vendor_package/CHANGELOG.rst | 4 ++-- ament_cmake_vendor_package/package.xml | 2 +- ament_cmake_version/CHANGELOG.rst | 4 ++-- ament_cmake_version/package.xml | 2 +- 44 files changed, 66 insertions(+), 66 deletions(-) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index dbe3062c..cf64726c 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake/package.xml b/ament_cmake/package.xml index 781b1790..3799b7c1 100644 --- a/ament_cmake/package.xml +++ b/ament_cmake/package.xml @@ -2,7 +2,7 @@ ament_cmake - 2.2.1 + 2.2.2 The entry point package for the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index f9e16afd..0df04d08 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_auto/package.xml b/ament_cmake_auto/package.xml index 3adf8fce..54e949d9 100644 --- a/ament_cmake_auto/package.xml +++ b/ament_cmake_auto/package.xml @@ -2,7 +2,7 @@ ament_cmake_auto - 2.2.1 + 2.2.2 The auto-magic functions for ease to use of the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index 3938b62d..beafd012 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_core/package.xml b/ament_cmake_core/package.xml index fadff616..bb7aa3e0 100644 --- a/ament_cmake_core/package.xml +++ b/ament_cmake_core/package.xml @@ -2,7 +2,7 @@ ament_cmake_core - 2.2.1 + 2.2.2 The core of the ament buildsystem in CMake. diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index a6a0a0ae..d6f29235 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_definitions/package.xml b/ament_cmake_export_definitions/package.xml index 6aae70a3..300414a5 100644 --- a/ament_cmake_export_definitions/package.xml +++ b/ament_cmake_export_definitions/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_definitions - 2.2.1 + 2.2.2 The ability to export definitions to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index 33e346ea..c0f06c91 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_dependencies/package.xml b/ament_cmake_export_dependencies/package.xml index d36c6578..d9cc768b 100644 --- a/ament_cmake_export_dependencies/package.xml +++ b/ament_cmake_export_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_dependencies - 2.2.1 + 2.2.2 The ability to export dependencies to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index e803e82c..e973150c 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_include_directories/package.xml b/ament_cmake_export_include_directories/package.xml index 255c67c9..26cc0ad6 100644 --- a/ament_cmake_export_include_directories/package.xml +++ b/ament_cmake_export_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_include_directories - 2.2.1 + 2.2.2 The ability to export include directories to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index 75403101..3be4ff95 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_interfaces/package.xml b/ament_cmake_export_interfaces/package.xml index d1f318f4..2fb5acb2 100644 --- a/ament_cmake_export_interfaces/package.xml +++ b/ament_cmake_export_interfaces/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_interfaces - 2.2.1 + 2.2.2 The ability to export interfaces to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index a13900b8..703b2538 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_libraries/package.xml b/ament_cmake_export_libraries/package.xml index 7a3ad3ce..9f9fcd74 100644 --- a/ament_cmake_export_libraries/package.xml +++ b/ament_cmake_export_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_libraries - 2.2.1 + 2.2.2 The ability to export libraries to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index afb744ab..702b44dd 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_link_flags/package.xml b/ament_cmake_export_link_flags/package.xml index c7002252..49926674 100644 --- a/ament_cmake_export_link_flags/package.xml +++ b/ament_cmake_export_link_flags/package.xml @@ -1,7 +1,7 @@ ament_cmake_export_link_flags - 2.2.1 + 2.2.2 The ability to export link flags to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index 9293fa9e..efc37ea5 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_export_targets/package.xml b/ament_cmake_export_targets/package.xml index 96a086cd..6d4af195 100644 --- a/ament_cmake_export_targets/package.xml +++ b/ament_cmake_export_targets/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_targets - 2.2.1 + 2.2.2 The ability to export targets to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index f15bd77e..beef18b7 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_gen_version_h/package.xml b/ament_cmake_gen_version_h/package.xml index faa9b7b4..e9f2ca4d 100644 --- a/ament_cmake_gen_version_h/package.xml +++ b/ament_cmake_gen_version_h/package.xml @@ -2,7 +2,7 @@ ament_cmake_gen_version_h - 2.2.1 + 2.2.2 Generate a C header containing the version number of the package Michael Jeronimo diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index a2d3baa1..caeceb00 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_gmock/package.xml b/ament_cmake_gmock/package.xml index e3e21025..26082b17 100644 --- a/ament_cmake_gmock/package.xml +++ b/ament_cmake_gmock/package.xml @@ -2,7 +2,7 @@ ament_cmake_gmock - 2.2.1 + 2.2.2 The ability to add Google mock-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index 94bf2301..35b13c6a 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_google_benchmark/package.xml b/ament_cmake_google_benchmark/package.xml index 97596441..3c1a43ef 100644 --- a/ament_cmake_google_benchmark/package.xml +++ b/ament_cmake_google_benchmark/package.xml @@ -2,7 +2,7 @@ ament_cmake_google_benchmark - 2.2.1 + 2.2.2 The ability to add Google Benchmark tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index a094cd28..47484cd5 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_gtest/package.xml b/ament_cmake_gtest/package.xml index 7c491023..e2b546ad 100644 --- a/ament_cmake_gtest/package.xml +++ b/ament_cmake_gtest/package.xml @@ -2,7 +2,7 @@ ament_cmake_gtest - 2.2.1 + 2.2.2 The ability to add gtest-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index c04db18b..ca691b6d 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_include_directories/package.xml b/ament_cmake_include_directories/package.xml index ed52e9ab..d457a97c 100644 --- a/ament_cmake_include_directories/package.xml +++ b/ament_cmake_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_include_directories - 2.2.1 + 2.2.2 The functionality to order include directories according to a chain of prefixes in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index a52779c6..89a33383 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_libraries/package.xml b/ament_cmake_libraries/package.xml index 5c96d796..7eb90f4a 100644 --- a/ament_cmake_libraries/package.xml +++ b/ament_cmake_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_libraries - 2.2.1 + 2.2.2 The functionality to deduplicate libraries in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index 89eda131..5e27d543 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_pytest/package.xml b/ament_cmake_pytest/package.xml index 9c0c9f56..2a22e638 100644 --- a/ament_cmake_pytest/package.xml +++ b/ament_cmake_pytest/package.xml @@ -2,7 +2,7 @@ ament_cmake_pytest - 2.2.1 + 2.2.2 The ability to run Python tests using pytest in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index 9b6a42fe..703afc21 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_python/package.xml b/ament_cmake_python/package.xml index f16233c3..f0fb41ab 100644 --- a/ament_cmake_python/package.xml +++ b/ament_cmake_python/package.xml @@ -2,7 +2,7 @@ ament_cmake_python - 2.2.1 + 2.2.2 The ability to use Python in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index 068262b2..0ed0a58c 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ * Fix `ament_target_dependencies` (`#452 `_) * Contributors: Vincent Richard diff --git a/ament_cmake_target_dependencies/package.xml b/ament_cmake_target_dependencies/package.xml index 3eec498a..9bd201d0 100644 --- a/ament_cmake_target_dependencies/package.xml +++ b/ament_cmake_target_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_target_dependencies - 2.2.1 + 2.2.2 The ability to add definitions, include directories and libraries of a package to a target in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index 7da67bc3..85318444 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_test/package.xml b/ament_cmake_test/package.xml index be8b40e5..e42d9577 100644 --- a/ament_cmake_test/package.xml +++ b/ament_cmake_test/package.xml @@ -2,7 +2,7 @@ ament_cmake_test - 2.2.1 + 2.2.2 The ability to add tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index c70d7e34..1cb34749 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ * Always set CMAKE_C[XX]_COMPILER for vendor packages if needed (`#476 `_) * Contributors: Christophe Bedard diff --git a/ament_cmake_vendor_package/package.xml b/ament_cmake_vendor_package/package.xml index 880d3239..24b87e8b 100644 --- a/ament_cmake_vendor_package/package.xml +++ b/ament_cmake_vendor_package/package.xml @@ -2,7 +2,7 @@ ament_cmake_vendor_package - 2.2.1 + 2.2.2 Macros for maintaining a 'vendor' package. Michael Jeronimo diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index 7b24cc7a..74776c85 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.2.2 (2023-08-21) +------------------ 2.2.1 (2023-06-21) ------------------ diff --git a/ament_cmake_version/package.xml b/ament_cmake_version/package.xml index 878d743b..5a751e88 100644 --- a/ament_cmake_version/package.xml +++ b/ament_cmake_version/package.xml @@ -2,7 +2,7 @@ ament_cmake_version - 2.2.1 + 2.2.2 The ability to override the exported package version in the ament buildsystem. Michael Jeronimo From 65b1754af10bb1f8d23f33d68ef6f41c0bce5376 Mon Sep 17 00:00:00 2001 From: Nick Morales <113186159+ngmor@users.noreply.github.com> Date: Fri, 1 Sep 2023 16:47:42 -0500 Subject: [PATCH 11/25] Recursively check for errors/failures in produced JUnit result XMLs (#446) Signed-off-by: Nick Morales --- ament_cmake_test/ament_cmake_test/__init__.py | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/ament_cmake_test/ament_cmake_test/__init__.py b/ament_cmake_test/ament_cmake_test/__init__.py index 2f5110e8..d084479c 100644 --- a/ament_cmake_test/ament_cmake_test/__init__.py +++ b/ament_cmake_test/ament_cmake_test/__init__.py @@ -304,10 +304,7 @@ def log(msg, **kwargs): rc = 1 else: # set error code when result file contains errors or failures - root = tree.getroot() - num_errors = int(root.attrib.get('errors', 0)) - num_failures = int(root.attrib.get('failures', 0)) - if num_errors or num_failures: + if _check_for_failure(tree): rc = 1 # ensure that a result file exists at the end @@ -318,6 +315,36 @@ def log(msg, **kwargs): return rc +def _check_for_failure(tree): + # Check tree for failures in nodes + root = tree.getroot() + return _check_for_failure_recursive(root) + +def _check_for_failure_recursive(node): + # Recursively check node and subnodes for test error or failure + + # First check if this node has nonzero error or failure attributes + # Return True (signifying a failure) if that is the case + if (int(node.attrib.get('errors', 0))) or (int(node.attrib.get('failures', 0))): + return True + + # Next check if the node is a "testsuite" tag. + if node.tag == 'testsuite': + # Check if the tag has error and/or failure attributes + if ((node.attrib.get('errors') is not None) + or (node.attrib.get('failures') is not None)): + # If so, we already know from above check that these attributes + # must have a zero value. Don't descend further into a testsuite + # tag that has error and/or failure attributes with a zero value. + # Return False indicating no failure in this branch. + return False + + # Otherwise, recursively check for failures inside this node + for child in node: + if _check_for_failure_recursive(child): + return True + + return False def _generate_result(result_file, *, failure_message=None, skip=False, error_message=None, test_time=0): From 12a5f38a5fb23d6273afd7292911db7e536f5ee3 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Thu, 7 Sep 2023 15:45:40 +0000 Subject: [PATCH 12/25] Changelog. Signed-off-by: Chris Lalancette --- ament_cmake/CHANGELOG.rst | 3 +++ ament_cmake_auto/CHANGELOG.rst | 3 +++ ament_cmake_core/CHANGELOG.rst | 3 +++ ament_cmake_export_definitions/CHANGELOG.rst | 3 +++ ament_cmake_export_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_export_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_export_interfaces/CHANGELOG.rst | 3 +++ ament_cmake_export_libraries/CHANGELOG.rst | 3 +++ ament_cmake_export_link_flags/CHANGELOG.rst | 3 +++ ament_cmake_export_targets/CHANGELOG.rst | 3 +++ ament_cmake_gen_version_h/CHANGELOG.rst | 3 +++ ament_cmake_gmock/CHANGELOG.rst | 3 +++ ament_cmake_google_benchmark/CHANGELOG.rst | 3 +++ ament_cmake_gtest/CHANGELOG.rst | 3 +++ ament_cmake_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_libraries/CHANGELOG.rst | 3 +++ ament_cmake_pytest/CHANGELOG.rst | 3 +++ ament_cmake_python/CHANGELOG.rst | 3 +++ ament_cmake_target_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_test/CHANGELOG.rst | 5 +++++ ament_cmake_vendor_package/CHANGELOG.rst | 3 +++ ament_cmake_version/CHANGELOG.rst | 3 +++ 22 files changed, 68 insertions(+) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index cf64726c..a388f812 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index 0df04d08..512a1e84 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index beafd012..a77ec645 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index d6f29235..ba4a1e4d 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index c0f06c91..df19cde3 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index e973150c..2d905933 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index 3be4ff95..62065bd4 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index 703b2538..b66a9038 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index 702b44dd..429f27da 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index efc37ea5..1002d797 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index beef18b7..453fbf37 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index caeceb00..5acf27e1 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index 35b13c6a..a6da0002 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index 47484cd5..29b49436 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index ca691b6d..07c4bcf9 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index 89a33383..8ad9322f 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index 5e27d543..91f16632 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index 703afc21..3d5d4e92 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index 0ed0a58c..28a83f41 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ * Fix `ament_target_dependencies` (`#452 `_) diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index 85318444..7d86fc3f 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Recursively check for errors/failures in produced JUnit result XMLs (`#446 `_) +* Contributors: Nick Morales + 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index 1cb34749..07b07066 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ * Always set CMAKE_C[XX]_COMPILER for vendor packages if needed (`#476 `_) diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index 74776c85..97be18c3 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.2.2 (2023-08-21) ------------------ From c5eb2cdc08cf318ad5e8fb14611106cea7ec4c1f Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Thu, 7 Sep 2023 15:45:49 +0000 Subject: [PATCH 13/25] 2.3.0 --- ament_cmake/CHANGELOG.rst | 4 ++-- ament_cmake/package.xml | 2 +- ament_cmake_auto/CHANGELOG.rst | 4 ++-- ament_cmake_auto/package.xml | 2 +- ament_cmake_core/CHANGELOG.rst | 4 ++-- ament_cmake_core/package.xml | 2 +- ament_cmake_export_definitions/CHANGELOG.rst | 4 ++-- ament_cmake_export_definitions/package.xml | 2 +- ament_cmake_export_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_export_dependencies/package.xml | 2 +- ament_cmake_export_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_export_include_directories/package.xml | 2 +- ament_cmake_export_interfaces/CHANGELOG.rst | 4 ++-- ament_cmake_export_interfaces/package.xml | 2 +- ament_cmake_export_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_export_libraries/package.xml | 2 +- ament_cmake_export_link_flags/CHANGELOG.rst | 4 ++-- ament_cmake_export_link_flags/package.xml | 2 +- ament_cmake_export_targets/CHANGELOG.rst | 4 ++-- ament_cmake_export_targets/package.xml | 2 +- ament_cmake_gen_version_h/CHANGELOG.rst | 4 ++-- ament_cmake_gen_version_h/package.xml | 2 +- ament_cmake_gmock/CHANGELOG.rst | 4 ++-- ament_cmake_gmock/package.xml | 2 +- ament_cmake_google_benchmark/CHANGELOG.rst | 4 ++-- ament_cmake_google_benchmark/package.xml | 2 +- ament_cmake_gtest/CHANGELOG.rst | 4 ++-- ament_cmake_gtest/package.xml | 2 +- ament_cmake_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_include_directories/package.xml | 2 +- ament_cmake_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_libraries/package.xml | 2 +- ament_cmake_pytest/CHANGELOG.rst | 4 ++-- ament_cmake_pytest/package.xml | 2 +- ament_cmake_python/CHANGELOG.rst | 4 ++-- ament_cmake_python/package.xml | 2 +- ament_cmake_target_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_target_dependencies/package.xml | 2 +- ament_cmake_test/CHANGELOG.rst | 4 ++-- ament_cmake_test/package.xml | 2 +- ament_cmake_vendor_package/CHANGELOG.rst | 4 ++-- ament_cmake_vendor_package/package.xml | 2 +- ament_cmake_version/CHANGELOG.rst | 4 ++-- ament_cmake_version/package.xml | 2 +- 44 files changed, 66 insertions(+), 66 deletions(-) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index a388f812..39368535 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake/package.xml b/ament_cmake/package.xml index 3799b7c1..f4be17e8 100644 --- a/ament_cmake/package.xml +++ b/ament_cmake/package.xml @@ -2,7 +2,7 @@ ament_cmake - 2.2.2 + 2.3.0 The entry point package for the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index 512a1e84..fd368458 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_auto/package.xml b/ament_cmake_auto/package.xml index 54e949d9..36fe3752 100644 --- a/ament_cmake_auto/package.xml +++ b/ament_cmake_auto/package.xml @@ -2,7 +2,7 @@ ament_cmake_auto - 2.2.2 + 2.3.0 The auto-magic functions for ease to use of the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index a77ec645..40a2b021 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_core/package.xml b/ament_cmake_core/package.xml index bb7aa3e0..36a230b7 100644 --- a/ament_cmake_core/package.xml +++ b/ament_cmake_core/package.xml @@ -2,7 +2,7 @@ ament_cmake_core - 2.2.2 + 2.3.0 The core of the ament buildsystem in CMake. diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index ba4a1e4d..c38897ee 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_definitions/package.xml b/ament_cmake_export_definitions/package.xml index 300414a5..a7949518 100644 --- a/ament_cmake_export_definitions/package.xml +++ b/ament_cmake_export_definitions/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_definitions - 2.2.2 + 2.3.0 The ability to export definitions to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index df19cde3..95af403a 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_dependencies/package.xml b/ament_cmake_export_dependencies/package.xml index d9cc768b..c26d8a50 100644 --- a/ament_cmake_export_dependencies/package.xml +++ b/ament_cmake_export_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_dependencies - 2.2.2 + 2.3.0 The ability to export dependencies to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index 2d905933..3fb8f160 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_include_directories/package.xml b/ament_cmake_export_include_directories/package.xml index 26cc0ad6..bb27b1c2 100644 --- a/ament_cmake_export_include_directories/package.xml +++ b/ament_cmake_export_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_include_directories - 2.2.2 + 2.3.0 The ability to export include directories to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index 62065bd4..0fd02ffe 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_interfaces/package.xml b/ament_cmake_export_interfaces/package.xml index 2fb5acb2..12611b3f 100644 --- a/ament_cmake_export_interfaces/package.xml +++ b/ament_cmake_export_interfaces/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_interfaces - 2.2.2 + 2.3.0 The ability to export interfaces to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index b66a9038..747e5a4b 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_libraries/package.xml b/ament_cmake_export_libraries/package.xml index 9f9fcd74..bc74ee72 100644 --- a/ament_cmake_export_libraries/package.xml +++ b/ament_cmake_export_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_libraries - 2.2.2 + 2.3.0 The ability to export libraries to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index 429f27da..eb62f92f 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_link_flags/package.xml b/ament_cmake_export_link_flags/package.xml index 49926674..3d45dc16 100644 --- a/ament_cmake_export_link_flags/package.xml +++ b/ament_cmake_export_link_flags/package.xml @@ -1,7 +1,7 @@ ament_cmake_export_link_flags - 2.2.2 + 2.3.0 The ability to export link flags to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index 1002d797..11c4476f 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_export_targets/package.xml b/ament_cmake_export_targets/package.xml index 6d4af195..6b46cede 100644 --- a/ament_cmake_export_targets/package.xml +++ b/ament_cmake_export_targets/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_targets - 2.2.2 + 2.3.0 The ability to export targets to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index 453fbf37..47c24a4f 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_gen_version_h/package.xml b/ament_cmake_gen_version_h/package.xml index e9f2ca4d..10618ade 100644 --- a/ament_cmake_gen_version_h/package.xml +++ b/ament_cmake_gen_version_h/package.xml @@ -2,7 +2,7 @@ ament_cmake_gen_version_h - 2.2.2 + 2.3.0 Generate a C header containing the version number of the package Michael Jeronimo diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index 5acf27e1..36ddc496 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_gmock/package.xml b/ament_cmake_gmock/package.xml index 26082b17..cd2fd642 100644 --- a/ament_cmake_gmock/package.xml +++ b/ament_cmake_gmock/package.xml @@ -2,7 +2,7 @@ ament_cmake_gmock - 2.2.2 + 2.3.0 The ability to add Google mock-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index a6da0002..becd8964 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_google_benchmark/package.xml b/ament_cmake_google_benchmark/package.xml index 3c1a43ef..fc94d72b 100644 --- a/ament_cmake_google_benchmark/package.xml +++ b/ament_cmake_google_benchmark/package.xml @@ -2,7 +2,7 @@ ament_cmake_google_benchmark - 2.2.2 + 2.3.0 The ability to add Google Benchmark tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index 29b49436..98388c1f 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_gtest/package.xml b/ament_cmake_gtest/package.xml index e2b546ad..5693c346 100644 --- a/ament_cmake_gtest/package.xml +++ b/ament_cmake_gtest/package.xml @@ -2,7 +2,7 @@ ament_cmake_gtest - 2.2.2 + 2.3.0 The ability to add gtest-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index 07c4bcf9..9ed79429 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_include_directories/package.xml b/ament_cmake_include_directories/package.xml index d457a97c..1b9287fa 100644 --- a/ament_cmake_include_directories/package.xml +++ b/ament_cmake_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_include_directories - 2.2.2 + 2.3.0 The functionality to order include directories according to a chain of prefixes in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index 8ad9322f..aa69cd25 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_libraries/package.xml b/ament_cmake_libraries/package.xml index 7eb90f4a..7d629f64 100644 --- a/ament_cmake_libraries/package.xml +++ b/ament_cmake_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_libraries - 2.2.2 + 2.3.0 The functionality to deduplicate libraries in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index 91f16632..e2f41cbe 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_pytest/package.xml b/ament_cmake_pytest/package.xml index 2a22e638..9fa453d5 100644 --- a/ament_cmake_pytest/package.xml +++ b/ament_cmake_pytest/package.xml @@ -2,7 +2,7 @@ ament_cmake_pytest - 2.2.2 + 2.3.0 The ability to run Python tests using pytest in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index 3d5d4e92..4edf5b37 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_python/package.xml b/ament_cmake_python/package.xml index f0fb41ab..a43dd739 100644 --- a/ament_cmake_python/package.xml +++ b/ament_cmake_python/package.xml @@ -2,7 +2,7 @@ ament_cmake_python - 2.2.2 + 2.3.0 The ability to use Python in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index 28a83f41..678714f8 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_target_dependencies/package.xml b/ament_cmake_target_dependencies/package.xml index 9bd201d0..6ac4c95a 100644 --- a/ament_cmake_target_dependencies/package.xml +++ b/ament_cmake_target_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_target_dependencies - 2.2.2 + 2.3.0 The ability to add definitions, include directories and libraries of a package to a target in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index 7d86fc3f..06b5991e 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ * Recursively check for errors/failures in produced JUnit result XMLs (`#446 `_) * Contributors: Nick Morales diff --git a/ament_cmake_test/package.xml b/ament_cmake_test/package.xml index e42d9577..ad7289f0 100644 --- a/ament_cmake_test/package.xml +++ b/ament_cmake_test/package.xml @@ -2,7 +2,7 @@ ament_cmake_test - 2.2.2 + 2.3.0 The ability to add tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index 07b07066..f703b558 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_vendor_package/package.xml b/ament_cmake_vendor_package/package.xml index 24b87e8b..65b8e28a 100644 --- a/ament_cmake_vendor_package/package.xml +++ b/ament_cmake_vendor_package/package.xml @@ -2,7 +2,7 @@ ament_cmake_vendor_package - 2.2.2 + 2.3.0 Macros for maintaining a 'vendor' package. Michael Jeronimo diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index 97be18c3..9f1ae867 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.0 (2023-09-07) +------------------ 2.2.2 (2023-08-21) ------------------ diff --git a/ament_cmake_version/package.xml b/ament_cmake_version/package.xml index 5a751e88..562bd6ee 100644 --- a/ament_cmake_version/package.xml +++ b/ament_cmake_version/package.xml @@ -2,7 +2,7 @@ ament_cmake_version - 2.2.2 + 2.3.0 The ability to override the exported package version in the ament buildsystem. Michael Jeronimo From 53d31f363941e1ef1aa85714d840ee5ca59ff5fd Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 10 Oct 2023 23:37:03 +0200 Subject: [PATCH 14/25] Fix CMake error when entire ament projects are added via add_subdirectory (#484) Signed-off-by: Silvio Traversaro --- .../cmake/environment_hooks/ament_environment_hooks.cmake | 2 +- .../ament_generate_package_environment.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ament_cmake_core/cmake/environment_hooks/ament_environment_hooks.cmake b/ament_cmake_core/cmake/environment_hooks/ament_environment_hooks.cmake index 6eef39cf..bd3d3850 100644 --- a/ament_cmake_core/cmake/environment_hooks/ament_environment_hooks.cmake +++ b/ament_cmake_core/cmake/environment_hooks/ament_environment_hooks.cmake @@ -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}" diff --git a/ament_cmake_core/cmake/environment_hooks/ament_generate_package_environment.cmake b/ament_cmake_core/cmake/environment_hooks/ament_generate_package_environment.cmake index d7b6bbb4..cfb417fa 100644 --- a/ament_cmake_core/cmake/environment_hooks/ament_generate_package_environment.cmake +++ b/ament_cmake_core/cmake/environment_hooks/ament_generate_package_environment.cmake @@ -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}" @@ -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") From 72b4246deae15b2dedab2c47940b66c5fc0cf382 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Mon, 16 Oct 2023 23:36:51 -0400 Subject: [PATCH 15/25] Update to C++17 (#488) Signed-off-by: Chris Lalancette --- ament_cmake_gen_version_h/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ament_cmake_gen_version_h/CMakeLists.txt b/ament_cmake_gen_version_h/CMakeLists.txt index c5e67912..7671905e 100644 --- a/ament_cmake_gen_version_h/CMakeLists.txt +++ b/ament_cmake_gen_version_h/CMakeLists.txt @@ -6,9 +6,10 @@ find_package(ament_cmake_core REQUIRED) if(NOT CMAKE_C_STANDARD) set(CMAKE_C_STANDARD 11) endif() -# GTest needs it, Default to C++14 +# GTest needs it, Default to C++17 if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) endif() include(CTest) From 261214a73714f6852bcc4b9dad5a3bf9156f603f Mon Sep 17 00:00:00 2001 From: Jordan Palacios Date: Tue, 17 Oct 2023 15:51:20 +0200 Subject: [PATCH 16/25] Add ament_auto_add_gmock to ament_cmake_auto (#482) * Adding ament_auto_add_gmock to ament_cmake_auto Similar rationale of ament_auto_add_gtest, but for gmock. ament_auto_add_gmock is a convinient macro that groups ament_add_gmock, target_include_directories, target_link_libraries and ament_target_dependencies in a single call for gmock tests. * Added missing find_package for ament auto gtest and gmock This saves us from having to test_depend ament_cmake_gtest or ament_cmake_gmock directly in the target's package.xml Signed-off-by: Jordan Palacios --- ament_cmake_auto/CMakeLists.txt | 1 + .../ament_cmake_auto-extras.cmake | 1 + .../cmake/ament_auto_add_gmock.cmake | 63 +++++++++++++++++++ .../cmake/ament_auto_add_gtest.cmake | 2 + ament_cmake_auto/package.xml | 2 + 5 files changed, 69 insertions(+) create mode 100644 ament_cmake_auto/cmake/ament_auto_add_gmock.cmake diff --git a/ament_cmake_auto/CMakeLists.txt b/ament_cmake_auto/CMakeLists.txt index 93fc0876..e31f08af 100644 --- a/ament_cmake_auto/CMakeLists.txt +++ b/ament_cmake_auto/CMakeLists.txt @@ -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( diff --git a/ament_cmake_auto/ament_cmake_auto-extras.cmake b/ament_cmake_auto/ament_cmake_auto-extras.cmake index 7d6055e3..8060b354 100644 --- a/ament_cmake_auto/ament_cmake_auto-extras.cmake +++ b/ament_cmake_auto/ament_cmake_auto-extras.cmake @@ -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") diff --git a/ament_cmake_auto/cmake/ament_auto_add_gmock.cmake b/ament_cmake_auto/cmake/ament_auto_add_gmock.cmake new file mode 100644 index 00000000..f96b94ee --- /dev/null +++ b/ament_cmake_auto/cmake/ament_auto_add_gmock.cmake @@ -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() diff --git a/ament_cmake_auto/cmake/ament_auto_add_gtest.cmake b/ament_cmake_auto/cmake/ament_auto_add_gtest.cmake index f723f9c9..417623fb 100644 --- a/ament_cmake_auto/cmake/ament_auto_add_gtest.cmake +++ b/ament_cmake_auto/cmake/ament_auto_add_gtest.cmake @@ -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) diff --git a/ament_cmake_auto/package.xml b/ament_cmake_auto/package.xml index 36fe3752..e0b60e83 100644 --- a/ament_cmake_auto/package.xml +++ b/ament_cmake_auto/package.xml @@ -13,8 +13,10 @@ Michel Hidalgo ament_cmake + ament_cmake_gmock ament_cmake_gtest ament_cmake + ament_cmake_gmock ament_cmake_gtest From 3af99e4824893f6b224d9b212ecf82a5f6f96203 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 2 Nov 2023 22:13:10 +0100 Subject: [PATCH 17/25] Use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR in ament_generate_environment (#485) Signed-off-by: Silvio Traversaro --- .../cmake/environment/ament_generate_environment.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ament_cmake_core/cmake/environment/ament_generate_environment.cmake b/ament_cmake_core/cmake/environment/ament_generate_environment.cmake index dabfa7bd..2995b60c 100644 --- a/ament_cmake_core/cmake/environment/ament_generate_environment.cmake +++ b/ament_cmake_core/cmake/environment/ament_generate_environment.cmake @@ -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( From ffacbf7b939d108e61d82e6d39438c7d61e0f894 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Mon, 6 Nov 2023 18:30:52 +0000 Subject: [PATCH 18/25] Changelog. Signed-off-by: Chris Lalancette --- ament_cmake/CHANGELOG.rst | 3 +++ ament_cmake_auto/CHANGELOG.rst | 5 +++++ ament_cmake_core/CHANGELOG.rst | 6 ++++++ ament_cmake_export_definitions/CHANGELOG.rst | 3 +++ ament_cmake_export_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_export_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_export_interfaces/CHANGELOG.rst | 3 +++ ament_cmake_export_libraries/CHANGELOG.rst | 3 +++ ament_cmake_export_link_flags/CHANGELOG.rst | 3 +++ ament_cmake_export_targets/CHANGELOG.rst | 3 +++ ament_cmake_gen_version_h/CHANGELOG.rst | 5 +++++ ament_cmake_gmock/CHANGELOG.rst | 3 +++ ament_cmake_google_benchmark/CHANGELOG.rst | 3 +++ ament_cmake_gtest/CHANGELOG.rst | 3 +++ ament_cmake_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_libraries/CHANGELOG.rst | 3 +++ ament_cmake_pytest/CHANGELOG.rst | 3 +++ ament_cmake_python/CHANGELOG.rst | 3 +++ ament_cmake_target_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_test/CHANGELOG.rst | 3 +++ ament_cmake_vendor_package/CHANGELOG.rst | 3 +++ ament_cmake_version/CHANGELOG.rst | 3 +++ 22 files changed, 73 insertions(+) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index 39368535..a606e21b 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index fd368458..f8bf4ed5 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Add ament_auto_add_gmock to ament_cmake_auto (`#482 `_) +* Contributors: Jordan Palacios + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index 40a2b021..f31e2da3 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,6 +2,12 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR in ament_generate_environment (`#485 `_) +* Fix CMake error when entire ament projects are added via add_subdirectory (`#484 `_) +* Contributors: Silvio Traversaro + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index c38897ee..0ac12029 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index 95af403a..88ebb780 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index 3fb8f160..661b838c 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index 0fd02ffe..23c86f2c 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index 747e5a4b..7f69e877 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index eb62f92f..51f8342c 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index 11c4476f..74a52d53 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index 47c24a4f..d7127d12 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Update to C++17 (`#488 `_) +* Contributors: Chris Lalancette + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index 36ddc496..41d98d0c 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index becd8964..33912d5d 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index 98388c1f..d1ff8f93 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index 9ed79429..f97eea82 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index aa69cd25..94919e90 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index e2f41cbe..c490951e 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index 4edf5b37..54be5af9 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index 678714f8..54c1e6e6 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index 06b5991e..ec6b0f81 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ * Recursively check for errors/failures in produced JUnit result XMLs (`#446 `_) diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index f703b558..48bd6fc4 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index 9f1ae867..145eca38 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.0 (2023-09-07) ------------------ From 46600b9a6c17648224dc2c9513648af5a3718dbc Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Mon, 6 Nov 2023 18:30:59 +0000 Subject: [PATCH 19/25] 2.3.1 --- ament_cmake/CHANGELOG.rst | 4 ++-- ament_cmake/package.xml | 2 +- ament_cmake_auto/CHANGELOG.rst | 4 ++-- ament_cmake_auto/package.xml | 2 +- ament_cmake_core/CHANGELOG.rst | 4 ++-- ament_cmake_core/package.xml | 2 +- ament_cmake_export_definitions/CHANGELOG.rst | 4 ++-- ament_cmake_export_definitions/package.xml | 2 +- ament_cmake_export_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_export_dependencies/package.xml | 2 +- ament_cmake_export_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_export_include_directories/package.xml | 2 +- ament_cmake_export_interfaces/CHANGELOG.rst | 4 ++-- ament_cmake_export_interfaces/package.xml | 2 +- ament_cmake_export_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_export_libraries/package.xml | 2 +- ament_cmake_export_link_flags/CHANGELOG.rst | 4 ++-- ament_cmake_export_link_flags/package.xml | 2 +- ament_cmake_export_targets/CHANGELOG.rst | 4 ++-- ament_cmake_export_targets/package.xml | 2 +- ament_cmake_gen_version_h/CHANGELOG.rst | 4 ++-- ament_cmake_gen_version_h/package.xml | 2 +- ament_cmake_gmock/CHANGELOG.rst | 4 ++-- ament_cmake_gmock/package.xml | 2 +- ament_cmake_google_benchmark/CHANGELOG.rst | 4 ++-- ament_cmake_google_benchmark/package.xml | 2 +- ament_cmake_gtest/CHANGELOG.rst | 4 ++-- ament_cmake_gtest/package.xml | 2 +- ament_cmake_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_include_directories/package.xml | 2 +- ament_cmake_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_libraries/package.xml | 2 +- ament_cmake_pytest/CHANGELOG.rst | 4 ++-- ament_cmake_pytest/package.xml | 2 +- ament_cmake_python/CHANGELOG.rst | 4 ++-- ament_cmake_python/package.xml | 2 +- ament_cmake_target_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_target_dependencies/package.xml | 2 +- ament_cmake_test/CHANGELOG.rst | 4 ++-- ament_cmake_test/package.xml | 2 +- ament_cmake_vendor_package/CHANGELOG.rst | 4 ++-- ament_cmake_vendor_package/package.xml | 2 +- ament_cmake_version/CHANGELOG.rst | 4 ++-- ament_cmake_version/package.xml | 2 +- 44 files changed, 66 insertions(+), 66 deletions(-) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index a606e21b..d220cc2b 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake/package.xml b/ament_cmake/package.xml index f4be17e8..a1e0397b 100644 --- a/ament_cmake/package.xml +++ b/ament_cmake/package.xml @@ -2,7 +2,7 @@ ament_cmake - 2.3.0 + 2.3.1 The entry point package for the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index f8bf4ed5..be807f26 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ * Add ament_auto_add_gmock to ament_cmake_auto (`#482 `_) * Contributors: Jordan Palacios diff --git a/ament_cmake_auto/package.xml b/ament_cmake_auto/package.xml index e0b60e83..76fb5b1b 100644 --- a/ament_cmake_auto/package.xml +++ b/ament_cmake_auto/package.xml @@ -2,7 +2,7 @@ ament_cmake_auto - 2.3.0 + 2.3.1 The auto-magic functions for ease to use of the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index f31e2da3..8f9c98e7 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ * Use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR in ament_generate_environment (`#485 `_) * Fix CMake error when entire ament projects are added via add_subdirectory (`#484 `_) * Contributors: Silvio Traversaro diff --git a/ament_cmake_core/package.xml b/ament_cmake_core/package.xml index 36a230b7..8b29e1b8 100644 --- a/ament_cmake_core/package.xml +++ b/ament_cmake_core/package.xml @@ -2,7 +2,7 @@ ament_cmake_core - 2.3.0 + 2.3.1 The core of the ament buildsystem in CMake. diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index 0ac12029..3711dd9a 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_definitions/package.xml b/ament_cmake_export_definitions/package.xml index a7949518..a1e2e47d 100644 --- a/ament_cmake_export_definitions/package.xml +++ b/ament_cmake_export_definitions/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_definitions - 2.3.0 + 2.3.1 The ability to export definitions to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index 88ebb780..a55b355a 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_dependencies/package.xml b/ament_cmake_export_dependencies/package.xml index c26d8a50..80fac2c0 100644 --- a/ament_cmake_export_dependencies/package.xml +++ b/ament_cmake_export_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_dependencies - 2.3.0 + 2.3.1 The ability to export dependencies to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index 661b838c..27f03862 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_include_directories/package.xml b/ament_cmake_export_include_directories/package.xml index bb27b1c2..4ce50fd6 100644 --- a/ament_cmake_export_include_directories/package.xml +++ b/ament_cmake_export_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_include_directories - 2.3.0 + 2.3.1 The ability to export include directories to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index 23c86f2c..301dfea3 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_interfaces/package.xml b/ament_cmake_export_interfaces/package.xml index 12611b3f..9e0bd26a 100644 --- a/ament_cmake_export_interfaces/package.xml +++ b/ament_cmake_export_interfaces/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_interfaces - 2.3.0 + 2.3.1 The ability to export interfaces to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index 7f69e877..5d04387c 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_libraries/package.xml b/ament_cmake_export_libraries/package.xml index bc74ee72..b2363dc4 100644 --- a/ament_cmake_export_libraries/package.xml +++ b/ament_cmake_export_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_libraries - 2.3.0 + 2.3.1 The ability to export libraries to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index 51f8342c..d2899c5a 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_link_flags/package.xml b/ament_cmake_export_link_flags/package.xml index 3d45dc16..cf67e719 100644 --- a/ament_cmake_export_link_flags/package.xml +++ b/ament_cmake_export_link_flags/package.xml @@ -1,7 +1,7 @@ ament_cmake_export_link_flags - 2.3.0 + 2.3.1 The ability to export link flags to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index 74a52d53..b9d5a10c 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_export_targets/package.xml b/ament_cmake_export_targets/package.xml index 6b46cede..faede277 100644 --- a/ament_cmake_export_targets/package.xml +++ b/ament_cmake_export_targets/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_targets - 2.3.0 + 2.3.1 The ability to export targets to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index d7127d12..290f060f 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ * Update to C++17 (`#488 `_) * Contributors: Chris Lalancette diff --git a/ament_cmake_gen_version_h/package.xml b/ament_cmake_gen_version_h/package.xml index 10618ade..7e7a2e1f 100644 --- a/ament_cmake_gen_version_h/package.xml +++ b/ament_cmake_gen_version_h/package.xml @@ -2,7 +2,7 @@ ament_cmake_gen_version_h - 2.3.0 + 2.3.1 Generate a C header containing the version number of the package Michael Jeronimo diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index 41d98d0c..5828ea3b 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_gmock/package.xml b/ament_cmake_gmock/package.xml index cd2fd642..b0a7b19e 100644 --- a/ament_cmake_gmock/package.xml +++ b/ament_cmake_gmock/package.xml @@ -2,7 +2,7 @@ ament_cmake_gmock - 2.3.0 + 2.3.1 The ability to add Google mock-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index 33912d5d..d31f3459 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_google_benchmark/package.xml b/ament_cmake_google_benchmark/package.xml index fc94d72b..688b844f 100644 --- a/ament_cmake_google_benchmark/package.xml +++ b/ament_cmake_google_benchmark/package.xml @@ -2,7 +2,7 @@ ament_cmake_google_benchmark - 2.3.0 + 2.3.1 The ability to add Google Benchmark tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index d1ff8f93..8c983a6d 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_gtest/package.xml b/ament_cmake_gtest/package.xml index 5693c346..dd3f994c 100644 --- a/ament_cmake_gtest/package.xml +++ b/ament_cmake_gtest/package.xml @@ -2,7 +2,7 @@ ament_cmake_gtest - 2.3.0 + 2.3.1 The ability to add gtest-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index f97eea82..d735c456 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_include_directories/package.xml b/ament_cmake_include_directories/package.xml index 1b9287fa..b6a81ed9 100644 --- a/ament_cmake_include_directories/package.xml +++ b/ament_cmake_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_include_directories - 2.3.0 + 2.3.1 The functionality to order include directories according to a chain of prefixes in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index 94919e90..a15c9499 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_libraries/package.xml b/ament_cmake_libraries/package.xml index 7d629f64..aa45d0cf 100644 --- a/ament_cmake_libraries/package.xml +++ b/ament_cmake_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_libraries - 2.3.0 + 2.3.1 The functionality to deduplicate libraries in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index c490951e..355deb41 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_pytest/package.xml b/ament_cmake_pytest/package.xml index 9fa453d5..cfecdd00 100644 --- a/ament_cmake_pytest/package.xml +++ b/ament_cmake_pytest/package.xml @@ -2,7 +2,7 @@ ament_cmake_pytest - 2.3.0 + 2.3.1 The ability to run Python tests using pytest in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index 54be5af9..4e5e1566 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_python/package.xml b/ament_cmake_python/package.xml index a43dd739..0e168b55 100644 --- a/ament_cmake_python/package.xml +++ b/ament_cmake_python/package.xml @@ -2,7 +2,7 @@ ament_cmake_python - 2.3.0 + 2.3.1 The ability to use Python in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index 54c1e6e6..12dc497c 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_target_dependencies/package.xml b/ament_cmake_target_dependencies/package.xml index 6ac4c95a..bd008353 100644 --- a/ament_cmake_target_dependencies/package.xml +++ b/ament_cmake_target_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_target_dependencies - 2.3.0 + 2.3.1 The ability to add definitions, include directories and libraries of a package to a target in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index ec6b0f81..2fe762d3 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_test/package.xml b/ament_cmake_test/package.xml index ad7289f0..f3f97fd0 100644 --- a/ament_cmake_test/package.xml +++ b/ament_cmake_test/package.xml @@ -2,7 +2,7 @@ ament_cmake_test - 2.3.0 + 2.3.1 The ability to add tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index 48bd6fc4..dbca2b2c 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_vendor_package/package.xml b/ament_cmake_vendor_package/package.xml index 65b8e28a..39ccb66f 100644 --- a/ament_cmake_vendor_package/package.xml +++ b/ament_cmake_vendor_package/package.xml @@ -2,7 +2,7 @@ ament_cmake_vendor_package - 2.3.0 + 2.3.1 Macros for maintaining a 'vendor' package. Michael Jeronimo diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index 145eca38..603b565a 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.1 (2023-11-06) +------------------ 2.3.0 (2023-09-07) ------------------ diff --git a/ament_cmake_version/package.xml b/ament_cmake_version/package.xml index 562bd6ee..1618cb62 100644 --- a/ament_cmake_version/package.xml +++ b/ament_cmake_version/package.xml @@ -2,7 +2,7 @@ ament_cmake_version - 2.3.0 + 2.3.1 The ability to override the exported package version in the ament buildsystem. Michael Jeronimo From 4f6f3499fe77eb46d30bfffd527258902a14dd8a Mon Sep 17 00:00:00 2001 From: Christopher Wecht Date: Wed, 15 Nov 2023 14:05:35 +0100 Subject: [PATCH 20/25] ament_add_gtest_test: add TEST_NAME parameter (#492) Signed-off-by: Christopher Wecht Co-authored-by: Christopher Wecht --- .../cmake/ament_add_gtest_test.cmake | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/ament_cmake_gtest/cmake/ament_add_gtest_test.cmake b/ament_cmake_gtest/cmake/ament_add_gtest_test.cmake index d27bd0bb..95d176b6 100644 --- a/ament_cmake_gtest/cmake/ament_add_gtest_test.cmake +++ b/ament_cmake_gtest/cmake/ament_add_gtest_test.cmake @@ -19,6 +19,7 @@ # If the specified target does not exist the registration is skipped. # # :param target: the target name which will also be used as the test name +# if TEST_NAME is not set # :type target: string # :param RUNNER: the path to the test runner script (default: see ament_add_test). # :type RUNNER: string @@ -28,6 +29,8 @@ # :param WORKING_DIRECTORY: the working directory for invoking the # executable in, default defined by ``ament_add_test()`` # :type WORKING_DIRECTORY: string +# :param TEST_NAME: the name of the test +# :type TEST_NAME: string # :param SKIP_TEST: if set mark the test as being skipped # :type SKIP_TEST: option # :param ENV: list of env vars to set; listed as ``VAR=value`` @@ -48,7 +51,7 @@ function(ament_add_gtest_test target) cmake_parse_arguments(ARG "SKIP_TEST" - "RUNNER;TIMEOUT;WORKING_DIRECTORY" + "RUNNER;TIMEOUT;WORKING_DIRECTORY;TEST_NAME" "APPEND_ENV;APPEND_LIBRARY_DIRS;ENV" ${ARGN}) if(ARG_UNPARSED_ARGUMENTS) @@ -56,8 +59,15 @@ function(ament_add_gtest_test target) "ament_add_gtest_test() called with unused arguments: ${ARGN}") endif() + + if(ARG_TEST_NAME) + set(TEST_NAME "${ARG_TEST_NAME}") + else() + set(TEST_NAME "${target}") + endif() + set(executable "$") - set(result_file "${AMENT_TEST_RESULTS_DIR}/${PROJECT_NAME}/${target}.gtest.xml") + set(result_file "${AMENT_TEST_RESULTS_DIR}/${PROJECT_NAME}/${TEST_NAME}.gtest.xml") set(cmd "${executable}" "--gtest_output=xml:${result_file}") @@ -84,9 +94,9 @@ function(ament_add_gtest_test target) endif() ament_add_test( - "${target}" + "${TEST_NAME}" COMMAND ${cmd} - OUTPUT_FILE "${CMAKE_BINARY_DIR}/ament_cmake_gtest/${target}.txt" + OUTPUT_FILE "${CMAKE_BINARY_DIR}/ament_cmake_gtest/${TEST_NAME}.txt" RESULT_FILE "${result_file}" ${ARG_RUNNER} ${ARG_SKIP_TEST} @@ -97,7 +107,7 @@ function(ament_add_gtest_test target) ${ARG_WORKING_DIRECTORY} ) set_tests_properties( - "${target}" + "${TEST_NAME}" PROPERTIES REQUIRED_FILES "${executable}" LABELS "gtest" From be887a4b05e98218d46a5e05980d8c23e90ed671 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Wed, 20 Dec 2023 20:46:29 -0500 Subject: [PATCH 21/25] Split ament_add_gmock into _executable and _test. (#497) This way we can use one part without the other when we need to. Signed-off-by: Chris Lalancette --- .../ament_cmake_gmock-extras.cmake | 2 + ament_cmake_gmock/cmake/ament_add_gmock.cmake | 84 ++++--------- .../cmake/ament_add_gmock_executable.cmake | 56 +++++++++ .../cmake/ament_add_gmock_test.cmake | 117 ++++++++++++++++++ .../cmake/ament_add_gtest_executable.cmake | 2 +- .../cmake/ament_add_gtest_test.cmake | 1 - 6 files changed, 201 insertions(+), 61 deletions(-) create mode 100644 ament_cmake_gmock/cmake/ament_add_gmock_executable.cmake create mode 100644 ament_cmake_gmock/cmake/ament_add_gmock_test.cmake diff --git a/ament_cmake_gmock/ament_cmake_gmock-extras.cmake b/ament_cmake_gmock/ament_cmake_gmock-extras.cmake index 631d0591..d6125540 100644 --- a/ament_cmake_gmock/ament_cmake_gmock-extras.cmake +++ b/ament_cmake_gmock/ament_cmake_gmock-extras.cmake @@ -117,4 +117,6 @@ macro(_ament_cmake_gmock_find_gmock) endmacro() include("${ament_cmake_gmock_DIR}/ament_add_gmock.cmake") +include("${ament_cmake_gmock_DIR}/ament_add_gmock_executable.cmake") +include("${ament_cmake_gmock_DIR}/ament_add_gmock_test.cmake") include("${ament_cmake_gmock_DIR}/ament_find_gmock.cmake") diff --git a/ament_cmake_gmock/cmake/ament_add_gmock.cmake b/ament_cmake_gmock/cmake/ament_add_gmock.cmake index 5b56e129..0fcee0b4 100644 --- a/ament_cmake_gmock/cmake/ament_add_gmock.cmake +++ b/ament_cmake_gmock/cmake/ament_add_gmock.cmake @@ -47,79 +47,45 @@ # @public # macro(ament_add_gmock target) - _ament_cmake_gmock_find_gmock() - if(GMOCK_FOUND) - _ament_add_gmock("${target}" ${ARGN}) - endif() -endmacro() - -function(_ament_add_gmock target) - cmake_parse_arguments(ARG + 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) + if(NOT _ARG_UNPARSED_ARGUMENTS) message(FATAL_ERROR "ament_add_gmock() must be invoked with at least one source file") endif() - # should be EXCLUDE_FROM_ALL if it would be possible - # to add this target as a dependency to the "test" target - add_executable("${target}" ${ARG_UNPARSED_ARGUMENTS}) - target_include_directories("${target}" SYSTEM PRIVATE "${GMOCK_INCLUDE_DIRS}") - if(NOT ARG_SKIP_LINKING_MAIN_LIBRARIES) - target_link_libraries("${target}" ${GMOCK_MAIN_LIBRARIES}) + # add executable + set(_argn_executable ${_ARG_UNPARSED_ARGUMENTS}) + if(_ARG_SKIP_LINKING_MAIN_LIBRARIES) + list(APPEND _argn_executable "SKIP_LINKING_MAIN_LIBRARIES") endif() - target_link_libraries("${target}" ${GMOCK_LIBRARIES}) + ament_add_gmock_executable("${target}" ${_argn_executable}) - set(executable "$") - set(result_file "${AMENT_TEST_RESULTS_DIR}/${PROJECT_NAME}/${target}.gtest.xml") - set(cmd - "${executable}" - "--gtest_output=xml:${result_file}") - if(ARG_ENV) - set(ARG_ENV "ENV" ${ARG_ENV}) + # add test + set(_argn_test "") + if(_ARG_RUNNER) + list(APPEND _argn_test "RUNNER" "${_ARG_RUNNER}") endif() - if(ARG_APPEND_ENV) - set(ARG_APPEND_ENV "APPEND_ENV" ${ARG_APPEND_ENV}) + if(_ARG_TIMEOUT) + list(APPEND _argn_test "TIMEOUT" "${_ARG_TIMEOUT}") endif() - if(ARG_APPEND_LIBRARY_DIRS) - set(ARG_APPEND_LIBRARY_DIRS "APPEND_LIBRARY_DIRS" ${ARG_APPEND_LIBRARY_DIRS}) + if(_ARG_WORKING_DIRECTORY) + list(APPEND _argn_test "WORKING_DIRECTORY" "${_ARG_WORKING_DIRECTORY}") endif() - # Options come out TRUE or FALSE but need to be passed as value or empty - if(ARG_SKIP_TEST) - set(ARG_SKIP_TEST "SKIP_TEST") - else() - set(ARG_SKIP_TEST "") + if(_ARG_SKIP_TEST) + list(APPEND _argn_test "SKIP_TEST") endif() - if(ARG_RUNNER) - set(ARG_RUNNER "RUNNER" ${ARG_RUNNER}) + if(_ARG_ENV) + list(APPEND _argn_test "ENV" ${_ARG_ENV}) endif() - if(ARG_TIMEOUT) - set(ARG_TIMEOUT "TIMEOUT" ${ARG_TIMEOUT}) + if(_ARG_APPEND_ENV) + list(APPEND _argn_test "APPEND_ENV" ${_ARG_APPEND_ENV}) endif() - if(ARG_WORKING_DIRECTORY) - set(ARG_WORKING_DIRECTORY "WORKING_DIRECTORY" "${ARG_WORKING_DIRECTORY}") + if(_ARG_APPEND_LIBRARY_DIRS) + list(APPEND _argn_test "APPEND_LIBRARY_DIRS" ${_ARG_APPEND_LIBRARY_DIRS}) endif() - - ament_add_test( - "${target}" - COMMAND ${cmd} - OUTPUT_FILE "${CMAKE_BINARY_DIR}/ament_cmake_gmock/${target}.txt" - RESULT_FILE "${result_file}" - ${ARG_RUNNER} - ${ARG_ENV} - ${ARG_APPEND_ENV} - ${ARG_APPEND_LIBRARY_DIRS} - ${ARG_SKIP_TEST} - ${ARG_TIMEOUT} - ${ARG_WORKING_DIRECTORY} - ) - set_tests_properties( - "${target}" - PROPERTIES - REQUIRED_FILES "${executable}" - LABELS "gmock" - ) -endfunction() + ament_add_gmock_test("${target}" ${_argn_test}) +endmacro() diff --git a/ament_cmake_gmock/cmake/ament_add_gmock_executable.cmake b/ament_cmake_gmock/cmake/ament_add_gmock_executable.cmake new file mode 100644 index 00000000..a1fcaea4 --- /dev/null +++ b/ament_cmake_gmock/cmake/ament_add_gmock_executable.cmake @@ -0,0 +1,56 @@ +# Copyright 2014-2015 Open Source Robotics Foundation, Inc. +# +# 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 an executable using gmock. +# +# Call add_executable(target ARGN) and link it against the gmock library. +# It does not register the executable as a test. +# +# If gmock is not available the specified target will not be 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 +# :type ARGN: list of strings +# :param SKIP_LINKING_MAIN_LIBRARIES: if set skip linking against the gmock +# main libraries +# :type SKIP_LINKING_MAIN_LIBRARIES: option +# +# @public +# +macro(ament_add_gmock_executable target) + _ament_cmake_gmock_find_gmock() + if(GMOCK_FOUND) + _ament_add_gmock_executable("${target}" ${ARGN}) + endif() +endmacro() + +function(_ament_add_gmock_executable target) + cmake_parse_arguments(ARG "SKIP_LINKING_MAIN_LIBRARIES" "" "" ${ARGN}) + if(NOT ARG_UNPARSED_ARGUMENTS) + message(FATAL_ERROR + "ament_add_gmock_executable() must be invoked with at least one source file") + endif() + + # should be EXCLUDE_FROM_ALL if it would be possible + # to add this target as a dependency to the "test" target + add_executable("${target}" ${ARG_UNPARSED_ARGUMENTS}) + target_include_directories("${target}" SYSTEM PRIVATE "${GMOCK_INCLUDE_DIRS}") + if(NOT ARG_SKIP_LINKING_MAIN_LIBRARIES) + target_link_libraries("${target}" ${GMOCK_MAIN_LIBRARIES}) + endif() + target_link_libraries("${target}" ${GMOCK_LIBRARIES}) +endfunction() diff --git a/ament_cmake_gmock/cmake/ament_add_gmock_test.cmake b/ament_cmake_gmock/cmake/ament_add_gmock_test.cmake new file mode 100644 index 00000000..46c56cdf --- /dev/null +++ b/ament_cmake_gmock/cmake/ament_add_gmock_test.cmake @@ -0,0 +1,117 @@ +# Copyright 2014-2015 Open Source Robotics Foundation, Inc. +# +# 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 an existing executable using gmock as a test. +# +# Register an executable created with ament_add_gmock_executable() as a test. +# If the specified target does not exist the registration is skipped. +# +# :param target: the target name which will also be used as the test name +# if TEST_NAME is not set +# :type target: string +# :param RUNNER: the path to the test runner script (default: see ament_add_test). +# :type RUNNER: string +# :param TIMEOUT: the test timeout in seconds, +# default defined by ``ament_add_test()`` +# :type TIMEOUT: integer +# :param WORKING_DIRECTORY: the working directory for invoking the +# executable in, default defined by ``ament_add_test()`` +# :type WORKING_DIRECTORY: string +# :param TEST_NAME: the name of the test +# :type TEST_NAME: string +# :param SKIP_TEST: if set mark the test as being skipped +# :type SKIP_TEST: option +# :param ENV: list of env vars to set; listed as ``VAR=value`` +# :type ENV: list of strings +# :param APPEND_ENV: list of env vars to append if already set, otherwise set; +# listed as ``VAR=value`` +# :type APPEND_ENV: list of strings +# :param APPEND_LIBRARY_DIRS: list of library dirs to append to the appropriate +# OS specific env var, a la LD_LIBRARY_PATH +# :type APPEND_LIBRARY_DIRS: list of strings +# +# @public +# +function(ament_add_gmock_test target) + if(NOT TARGET ${target}) + return() + endif() + + cmake_parse_arguments(ARG + "SKIP_TEST" + "RUNNER;TIMEOUT;WORKING_DIRECTORY;TEST_NAME" + "APPEND_ENV;APPEND_LIBRARY_DIRS;ENV" + ${ARGN}) + if(ARG_UNPARSED_ARGUMENTS) + message(FATAL_ERROR + "ament_add_gmock_test() called with unused arguments: ${ARGN}") + endif() + + if(ARG_TEST_NAME) + set(TEST_NAME "${ARG_TEST_NAME}") + else() + set(TEST_NAME "${target}") + endif() + + set(executable "$") + set(result_file "${AMENT_TEST_RESULTS_DIR}/${PROJECT_NAME}/${target}.gtest.xml") + set(cmd + "${executable}" + "--gtest_output=xml:${result_file}") + if(ARG_ENV) + set(ARG_ENV "ENV" ${ARG_ENV}) + endif() + if(ARG_APPEND_ENV) + set(ARG_APPEND_ENV "APPEND_ENV" ${ARG_APPEND_ENV}) + endif() + if(ARG_APPEND_LIBRARY_DIRS) + set(ARG_APPEND_LIBRARY_DIRS "APPEND_LIBRARY_DIRS" ${ARG_APPEND_LIBRARY_DIRS}) + endif() + if(ARG_RUNNER) + set(ARG_RUNNER "RUNNER" ${ARG_RUNNER}) + endif() + if(ARG_TIMEOUT) + set(ARG_TIMEOUT "TIMEOUT" ${ARG_TIMEOUT}) + endif() + if(ARG_WORKING_DIRECTORY) + set(ARG_WORKING_DIRECTORY "WORKING_DIRECTORY" "${ARG_WORKING_DIRECTORY}") + endif() + # Options come out TRUE or FALSE but need to be passed as value or empty + if(ARG_SKIP_TEST) + set(ARG_SKIP_TEST "SKIP_TEST") + else() + set(ARG_SKIP_TEST "") + endif() + + ament_add_test( + "${TEST_NAME}" + COMMAND ${cmd} + OUTPUT_FILE "${CMAKE_BINARY_DIR}/ament_cmake_gmock/${TEST_NAME}.txt" + RESULT_FILE "${result_file}" + ${ARG_RUNNER} + ${ARG_SKIP_TEST} + ${ARG_ENV} + ${ARG_APPEND_ENV} + ${ARG_APPEND_LIBRARY_DIRS} + ${ARG_TIMEOUT} + ${ARG_WORKING_DIRECTORY} + ) + set_tests_properties( + "${TEST_NAME}" + PROPERTIES + REQUIRED_FILES "${executable}" + LABELS "gmock" + ) +endfunction() diff --git a/ament_cmake_gtest/cmake/ament_add_gtest_executable.cmake b/ament_cmake_gtest/cmake/ament_add_gtest_executable.cmake index e287b895..644a23b0 100644 --- a/ament_cmake_gtest/cmake/ament_add_gtest_executable.cmake +++ b/ament_cmake_gtest/cmake/ament_add_gtest_executable.cmake @@ -18,7 +18,7 @@ # Call add_executable(target ARGN) and link it against the gtest libraries. # It does not register the executable as a test. # -# If gtest is not available the specified target is not being created and +# If gtest is not available the specified target will 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 diff --git a/ament_cmake_gtest/cmake/ament_add_gtest_test.cmake b/ament_cmake_gtest/cmake/ament_add_gtest_test.cmake index 95d176b6..4a3feae0 100644 --- a/ament_cmake_gtest/cmake/ament_add_gtest_test.cmake +++ b/ament_cmake_gtest/cmake/ament_add_gtest_test.cmake @@ -59,7 +59,6 @@ function(ament_add_gtest_test target) "ament_add_gtest_test() called with unused arguments: ${ARGN}") endif() - if(ARG_TEST_NAME) set(TEST_NAME "${ARG_TEST_NAME}") else() From aef4347625d2085297edcfb09f4cf8253658befe Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Tue, 26 Dec 2023 18:15:02 +0000 Subject: [PATCH 22/25] Changelog. Signed-off-by: Chris Lalancette --- ament_cmake/CHANGELOG.rst | 3 +++ ament_cmake_auto/CHANGELOG.rst | 3 +++ ament_cmake_core/CHANGELOG.rst | 3 +++ ament_cmake_export_definitions/CHANGELOG.rst | 3 +++ ament_cmake_export_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_export_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_export_interfaces/CHANGELOG.rst | 3 +++ ament_cmake_export_libraries/CHANGELOG.rst | 3 +++ ament_cmake_export_link_flags/CHANGELOG.rst | 3 +++ ament_cmake_export_targets/CHANGELOG.rst | 3 +++ ament_cmake_gen_version_h/CHANGELOG.rst | 3 +++ ament_cmake_gmock/CHANGELOG.rst | 5 +++++ ament_cmake_google_benchmark/CHANGELOG.rst | 3 +++ ament_cmake_gtest/CHANGELOG.rst | 6 ++++++ ament_cmake_include_directories/CHANGELOG.rst | 3 +++ ament_cmake_libraries/CHANGELOG.rst | 3 +++ ament_cmake_pytest/CHANGELOG.rst | 3 +++ ament_cmake_python/CHANGELOG.rst | 3 +++ ament_cmake_target_dependencies/CHANGELOG.rst | 3 +++ ament_cmake_test/CHANGELOG.rst | 3 +++ ament_cmake_vendor_package/CHANGELOG.rst | 3 +++ ament_cmake_version/CHANGELOG.rst | 3 +++ 22 files changed, 71 insertions(+) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index d220cc2b..c81d1046 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index be807f26..beb4a512 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ * Add ament_auto_add_gmock to ament_cmake_auto (`#482 `_) diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index 8f9c98e7..b70b4de0 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ * Use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR in ament_generate_environment (`#485 `_) diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index 3711dd9a..d88e3821 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index a55b355a..344db0ac 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index 27f03862..d50f8fb0 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index 301dfea3..c77f4734 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index 5d04387c..29c803b5 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index d2899c5a..e80a226a 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index b9d5a10c..4a9607db 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index 290f060f..1a40c87c 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ * Update to C++17 (`#488 `_) diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index 5828ea3b..49385bd5 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Split ament_add_gmock into _executable and _test. (`#497 `_) +* Contributors: Chris Lalancette + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index d31f3459..feacf700 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index 8c983a6d..92fa87e6 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,6 +2,12 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Split ament_add_gmock into _executable and _test. (`#497 `_) +* ament_add_gtest_test: add TEST_NAME parameter (`#492 `_) +* Contributors: Chris Lalancette, Christopher Wecht + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index d735c456..87acb9f0 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index a15c9499..b60b9a3d 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index 355deb41..0b9ca1bb 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index 4e5e1566..adf65b8a 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index 12dc497c..eaec86ca 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index 2fe762d3..26421de2 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index dbca2b2c..aa69ff8c 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index 603b565a..d8c69099 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 2.3.1 (2023-11-06) ------------------ From a6a7e0c775545e6f13d767b6012b72ec358248c6 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Tue, 26 Dec 2023 18:15:11 +0000 Subject: [PATCH 23/25] 2.3.2 --- ament_cmake/CHANGELOG.rst | 4 ++-- ament_cmake/package.xml | 2 +- ament_cmake_auto/CHANGELOG.rst | 4 ++-- ament_cmake_auto/package.xml | 2 +- ament_cmake_core/CHANGELOG.rst | 4 ++-- ament_cmake_core/package.xml | 2 +- ament_cmake_export_definitions/CHANGELOG.rst | 4 ++-- ament_cmake_export_definitions/package.xml | 2 +- ament_cmake_export_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_export_dependencies/package.xml | 2 +- ament_cmake_export_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_export_include_directories/package.xml | 2 +- ament_cmake_export_interfaces/CHANGELOG.rst | 4 ++-- ament_cmake_export_interfaces/package.xml | 2 +- ament_cmake_export_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_export_libraries/package.xml | 2 +- ament_cmake_export_link_flags/CHANGELOG.rst | 4 ++-- ament_cmake_export_link_flags/package.xml | 2 +- ament_cmake_export_targets/CHANGELOG.rst | 4 ++-- ament_cmake_export_targets/package.xml | 2 +- ament_cmake_gen_version_h/CHANGELOG.rst | 4 ++-- ament_cmake_gen_version_h/package.xml | 2 +- ament_cmake_gmock/CHANGELOG.rst | 4 ++-- ament_cmake_gmock/package.xml | 2 +- ament_cmake_google_benchmark/CHANGELOG.rst | 4 ++-- ament_cmake_google_benchmark/package.xml | 2 +- ament_cmake_gtest/CHANGELOG.rst | 4 ++-- ament_cmake_gtest/package.xml | 2 +- ament_cmake_include_directories/CHANGELOG.rst | 4 ++-- ament_cmake_include_directories/package.xml | 2 +- ament_cmake_libraries/CHANGELOG.rst | 4 ++-- ament_cmake_libraries/package.xml | 2 +- ament_cmake_pytest/CHANGELOG.rst | 4 ++-- ament_cmake_pytest/package.xml | 2 +- ament_cmake_python/CHANGELOG.rst | 4 ++-- ament_cmake_python/package.xml | 2 +- ament_cmake_target_dependencies/CHANGELOG.rst | 4 ++-- ament_cmake_target_dependencies/package.xml | 2 +- ament_cmake_test/CHANGELOG.rst | 4 ++-- ament_cmake_test/package.xml | 2 +- ament_cmake_vendor_package/CHANGELOG.rst | 4 ++-- ament_cmake_vendor_package/package.xml | 2 +- ament_cmake_version/CHANGELOG.rst | 4 ++-- ament_cmake_version/package.xml | 2 +- 44 files changed, 66 insertions(+), 66 deletions(-) diff --git a/ament_cmake/CHANGELOG.rst b/ament_cmake/CHANGELOG.rst index c81d1046..3aded886 100644 --- a/ament_cmake/CHANGELOG.rst +++ b/ament_cmake/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake/package.xml b/ament_cmake/package.xml index a1e0397b..b22f7c5d 100644 --- a/ament_cmake/package.xml +++ b/ament_cmake/package.xml @@ -2,7 +2,7 @@ ament_cmake - 2.3.1 + 2.3.2 The entry point package for the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_auto/CHANGELOG.rst b/ament_cmake_auto/CHANGELOG.rst index beb4a512..72c798ae 100644 --- a/ament_cmake_auto/CHANGELOG.rst +++ b/ament_cmake_auto/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_auto ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_auto/package.xml b/ament_cmake_auto/package.xml index 76fb5b1b..a4d27a62 100644 --- a/ament_cmake_auto/package.xml +++ b/ament_cmake_auto/package.xml @@ -2,7 +2,7 @@ ament_cmake_auto - 2.3.1 + 2.3.2 The auto-magic functions for ease to use of the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_core/CHANGELOG.rst b/ament_cmake_core/CHANGELOG.rst index b70b4de0..5a94a575 100644 --- a/ament_cmake_core/CHANGELOG.rst +++ b/ament_cmake_core/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_core/package.xml b/ament_cmake_core/package.xml index 8b29e1b8..125ebe43 100644 --- a/ament_cmake_core/package.xml +++ b/ament_cmake_core/package.xml @@ -2,7 +2,7 @@ ament_cmake_core - 2.3.1 + 2.3.2 The core of the ament buildsystem in CMake. diff --git a/ament_cmake_export_definitions/CHANGELOG.rst b/ament_cmake_export_definitions/CHANGELOG.rst index d88e3821..29d5d5f3 100644 --- a/ament_cmake_export_definitions/CHANGELOG.rst +++ b/ament_cmake_export_definitions/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_definitions/package.xml b/ament_cmake_export_definitions/package.xml index a1e2e47d..6f64b46a 100644 --- a/ament_cmake_export_definitions/package.xml +++ b/ament_cmake_export_definitions/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_definitions - 2.3.1 + 2.3.2 The ability to export definitions to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_dependencies/CHANGELOG.rst b/ament_cmake_export_dependencies/CHANGELOG.rst index 344db0ac..a4531625 100644 --- a/ament_cmake_export_dependencies/CHANGELOG.rst +++ b/ament_cmake_export_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_dependencies/package.xml b/ament_cmake_export_dependencies/package.xml index 80fac2c0..a4a4f68d 100644 --- a/ament_cmake_export_dependencies/package.xml +++ b/ament_cmake_export_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_dependencies - 2.3.1 + 2.3.2 The ability to export dependencies to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_include_directories/CHANGELOG.rst b/ament_cmake_export_include_directories/CHANGELOG.rst index d50f8fb0..050c1fdb 100644 --- a/ament_cmake_export_include_directories/CHANGELOG.rst +++ b/ament_cmake_export_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_include_directories/package.xml b/ament_cmake_export_include_directories/package.xml index 4ce50fd6..7fb07329 100644 --- a/ament_cmake_export_include_directories/package.xml +++ b/ament_cmake_export_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_include_directories - 2.3.1 + 2.3.2 The ability to export include directories to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_interfaces/CHANGELOG.rst b/ament_cmake_export_interfaces/CHANGELOG.rst index c77f4734..4ffbd713 100644 --- a/ament_cmake_export_interfaces/CHANGELOG.rst +++ b/ament_cmake_export_interfaces/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_interfaces ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_interfaces/package.xml b/ament_cmake_export_interfaces/package.xml index 9e0bd26a..b71d1386 100644 --- a/ament_cmake_export_interfaces/package.xml +++ b/ament_cmake_export_interfaces/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_interfaces - 2.3.1 + 2.3.2 The ability to export interfaces to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_libraries/CHANGELOG.rst b/ament_cmake_export_libraries/CHANGELOG.rst index 29c803b5..ac7ac2cd 100644 --- a/ament_cmake_export_libraries/CHANGELOG.rst +++ b/ament_cmake_export_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_libraries/package.xml b/ament_cmake_export_libraries/package.xml index b2363dc4..828f1831 100644 --- a/ament_cmake_export_libraries/package.xml +++ b/ament_cmake_export_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_libraries - 2.3.1 + 2.3.2 The ability to export libraries to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_export_link_flags/CHANGELOG.rst b/ament_cmake_export_link_flags/CHANGELOG.rst index e80a226a..0c4facd9 100644 --- a/ament_cmake_export_link_flags/CHANGELOG.rst +++ b/ament_cmake_export_link_flags/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_link_flags ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_link_flags/package.xml b/ament_cmake_export_link_flags/package.xml index cf67e719..d2cb8aaf 100644 --- a/ament_cmake_export_link_flags/package.xml +++ b/ament_cmake_export_link_flags/package.xml @@ -1,7 +1,7 @@ ament_cmake_export_link_flags - 2.3.1 + 2.3.2 The ability to export link flags to downstream packages in the ament buildsystem. Michael Jeronimo diff --git a/ament_cmake_export_targets/CHANGELOG.rst b/ament_cmake_export_targets/CHANGELOG.rst index 4a9607db..a67ecbe5 100644 --- a/ament_cmake_export_targets/CHANGELOG.rst +++ b/ament_cmake_export_targets/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_export_targets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_export_targets/package.xml b/ament_cmake_export_targets/package.xml index faede277..ee3282a8 100644 --- a/ament_cmake_export_targets/package.xml +++ b/ament_cmake_export_targets/package.xml @@ -2,7 +2,7 @@ ament_cmake_export_targets - 2.3.1 + 2.3.2 The ability to export targets to downstream packages in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gen_version_h/CHANGELOG.rst b/ament_cmake_gen_version_h/CHANGELOG.rst index 1a40c87c..52bf6214 100644 --- a/ament_cmake_gen_version_h/CHANGELOG.rst +++ b/ament_cmake_gen_version_h/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gen_version_h ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_gen_version_h/package.xml b/ament_cmake_gen_version_h/package.xml index 7e7a2e1f..7cd065de 100644 --- a/ament_cmake_gen_version_h/package.xml +++ b/ament_cmake_gen_version_h/package.xml @@ -2,7 +2,7 @@ ament_cmake_gen_version_h - 2.3.1 + 2.3.2 Generate a C header containing the version number of the package Michael Jeronimo diff --git a/ament_cmake_gmock/CHANGELOG.rst b/ament_cmake_gmock/CHANGELOG.rst index 49385bd5..666c6a55 100644 --- a/ament_cmake_gmock/CHANGELOG.rst +++ b/ament_cmake_gmock/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gmock ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ * Split ament_add_gmock into _executable and _test. (`#497 `_) * Contributors: Chris Lalancette diff --git a/ament_cmake_gmock/package.xml b/ament_cmake_gmock/package.xml index b0a7b19e..3242be25 100644 --- a/ament_cmake_gmock/package.xml +++ b/ament_cmake_gmock/package.xml @@ -2,7 +2,7 @@ ament_cmake_gmock - 2.3.1 + 2.3.2 The ability to add Google mock-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_google_benchmark/CHANGELOG.rst b/ament_cmake_google_benchmark/CHANGELOG.rst index feacf700..d1307b85 100644 --- a/ament_cmake_google_benchmark/CHANGELOG.rst +++ b/ament_cmake_google_benchmark/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_google_benchmark ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_google_benchmark/package.xml b/ament_cmake_google_benchmark/package.xml index 688b844f..a5595127 100644 --- a/ament_cmake_google_benchmark/package.xml +++ b/ament_cmake_google_benchmark/package.xml @@ -2,7 +2,7 @@ ament_cmake_google_benchmark - 2.3.1 + 2.3.2 The ability to add Google Benchmark tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_gtest/CHANGELOG.rst b/ament_cmake_gtest/CHANGELOG.rst index 92fa87e6..dff1bac9 100644 --- a/ament_cmake_gtest/CHANGELOG.rst +++ b/ament_cmake_gtest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_gtest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ * Split ament_add_gmock into _executable and _test. (`#497 `_) * ament_add_gtest_test: add TEST_NAME parameter (`#492 `_) * Contributors: Chris Lalancette, Christopher Wecht diff --git a/ament_cmake_gtest/package.xml b/ament_cmake_gtest/package.xml index dd3f994c..c15a82ee 100644 --- a/ament_cmake_gtest/package.xml +++ b/ament_cmake_gtest/package.xml @@ -2,7 +2,7 @@ ament_cmake_gtest - 2.3.1 + 2.3.2 The ability to add gtest-based tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_include_directories/CHANGELOG.rst b/ament_cmake_include_directories/CHANGELOG.rst index 87acb9f0..d2cf19b5 100644 --- a/ament_cmake_include_directories/CHANGELOG.rst +++ b/ament_cmake_include_directories/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_include_directories ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_include_directories/package.xml b/ament_cmake_include_directories/package.xml index b6a81ed9..3607de6f 100644 --- a/ament_cmake_include_directories/package.xml +++ b/ament_cmake_include_directories/package.xml @@ -2,7 +2,7 @@ ament_cmake_include_directories - 2.3.1 + 2.3.2 The functionality to order include directories according to a chain of prefixes in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_libraries/CHANGELOG.rst b/ament_cmake_libraries/CHANGELOG.rst index b60b9a3d..d0e36b7c 100644 --- a/ament_cmake_libraries/CHANGELOG.rst +++ b/ament_cmake_libraries/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_libraries/package.xml b/ament_cmake_libraries/package.xml index aa45d0cf..491bbe27 100644 --- a/ament_cmake_libraries/package.xml +++ b/ament_cmake_libraries/package.xml @@ -2,7 +2,7 @@ ament_cmake_libraries - 2.3.1 + 2.3.2 The functionality to deduplicate libraries in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_pytest/CHANGELOG.rst b/ament_cmake_pytest/CHANGELOG.rst index 0b9ca1bb..674a722d 100644 --- a/ament_cmake_pytest/CHANGELOG.rst +++ b/ament_cmake_pytest/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_pytest/package.xml b/ament_cmake_pytest/package.xml index cfecdd00..2afb85a4 100644 --- a/ament_cmake_pytest/package.xml +++ b/ament_cmake_pytest/package.xml @@ -2,7 +2,7 @@ ament_cmake_pytest - 2.3.1 + 2.3.2 The ability to run Python tests using pytest in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_python/CHANGELOG.rst b/ament_cmake_python/CHANGELOG.rst index adf65b8a..8bf68149 100644 --- a/ament_cmake_python/CHANGELOG.rst +++ b/ament_cmake_python/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_python ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_python/package.xml b/ament_cmake_python/package.xml index 0e168b55..d47094d4 100644 --- a/ament_cmake_python/package.xml +++ b/ament_cmake_python/package.xml @@ -2,7 +2,7 @@ ament_cmake_python - 2.3.1 + 2.3.2 The ability to use Python in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_target_dependencies/CHANGELOG.rst b/ament_cmake_target_dependencies/CHANGELOG.rst index eaec86ca..8bdb00a6 100644 --- a/ament_cmake_target_dependencies/CHANGELOG.rst +++ b/ament_cmake_target_dependencies/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_target_dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_target_dependencies/package.xml b/ament_cmake_target_dependencies/package.xml index bd008353..5b541af4 100644 --- a/ament_cmake_target_dependencies/package.xml +++ b/ament_cmake_target_dependencies/package.xml @@ -2,7 +2,7 @@ ament_cmake_target_dependencies - 2.3.1 + 2.3.2 The ability to add definitions, include directories and libraries of a package to a target in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_test/CHANGELOG.rst b/ament_cmake_test/CHANGELOG.rst index 26421de2..bdffa40d 100644 --- a/ament_cmake_test/CHANGELOG.rst +++ b/ament_cmake_test/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_test ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_test/package.xml b/ament_cmake_test/package.xml index f3f97fd0..1afb49e5 100644 --- a/ament_cmake_test/package.xml +++ b/ament_cmake_test/package.xml @@ -2,7 +2,7 @@ ament_cmake_test - 2.3.1 + 2.3.2 The ability to add tests in the ament buildsystem in CMake. Michael Jeronimo diff --git a/ament_cmake_vendor_package/CHANGELOG.rst b/ament_cmake_vendor_package/CHANGELOG.rst index aa69ff8c..09b53f5c 100644 --- a/ament_cmake_vendor_package/CHANGELOG.rst +++ b/ament_cmake_vendor_package/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_vendor_package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_vendor_package/package.xml b/ament_cmake_vendor_package/package.xml index 39ccb66f..31b34ff9 100644 --- a/ament_cmake_vendor_package/package.xml +++ b/ament_cmake_vendor_package/package.xml @@ -2,7 +2,7 @@ ament_cmake_vendor_package - 2.3.1 + 2.3.2 Macros for maintaining a 'vendor' package. Michael Jeronimo diff --git a/ament_cmake_version/CHANGELOG.rst b/ament_cmake_version/CHANGELOG.rst index d8c69099..b04b470a 100644 --- a/ament_cmake_version/CHANGELOG.rst +++ b/ament_cmake_version/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package ament_cmake_version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +2.3.2 (2023-12-26) +------------------ 2.3.1 (2023-11-06) ------------------ diff --git a/ament_cmake_version/package.xml b/ament_cmake_version/package.xml index 1618cb62..3bbd9963 100644 --- a/ament_cmake_version/package.xml +++ b/ament_cmake_version/package.xml @@ -2,7 +2,7 @@ ament_cmake_version - 2.3.1 + 2.3.2 The ability to override the exported package version in the ament buildsystem. Michael Jeronimo From 7fdd2d124a7a0e9744d982838f025ccecd685180 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 7 Feb 2024 15:57:47 -0700 Subject: [PATCH 24/25] Add NAMESPACE support to ament_export_targets (#498) * Add NAMESPACE support to ament_export_targets * Improve documentation for NAMESPACE argument Signed-off-by: Ryan Friedman --- ...ament_cmake_export_targets_package_hook.cmake | 2 +- .../cmake/ament_export_targets.cmake | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ament_cmake_export_targets/cmake/ament_cmake_export_targets_package_hook.cmake b/ament_cmake_export_targets/cmake/ament_cmake_export_targets_package_hook.cmake index aaf96670..a500f5b2 100644 --- a/ament_cmake_export_targets/cmake/ament_cmake_export_targets_package_hook.cmake +++ b/ament_cmake_export_targets/cmake/ament_cmake_export_targets_package_hook.cmake @@ -28,7 +28,7 @@ if(NOT _AMENT_CMAKE_EXPORT_TARGETS STREQUAL "") install( EXPORT "${_target}" DESTINATION share/${PROJECT_NAME}/cmake - NAMESPACE "${PROJECT_NAME}::" + NAMESPACE "${_AMENT_CMAKE_EXPORT_TARGETS_NAMESPACE}" FILE "${_target}Export.cmake" ) endforeach() diff --git a/ament_cmake_export_targets/cmake/ament_export_targets.cmake b/ament_cmake_export_targets/cmake/ament_export_targets.cmake index f48a1247..b4071a5d 100644 --- a/ament_cmake_export_targets/cmake/ament_export_targets.cmake +++ b/ament_cmake_export_targets/cmake/ament_export_targets.cmake @@ -16,12 +16,17 @@ # Export targets to downstream packages. # # Each export name must have been used to install targets using -# ``install(TARGETS ... EXPORT name ...)``. +# ``install(TARGETS ... EXPORT name NAMESPACE my_namespace ...)``. # The ``install(EXPORT ...)`` invocation is handled by this macros. # # :param HAS_LIBRARY_TARGET: if set, an environment variable will be defined # so that the library can be found at runtime # :type HAS_LIBRARY_TARGET: option +# :keyword NAMESPACE: the exported namespace for the target if set. +# The default is the value of ``${PROJECT_NAME}::``. +# This is an advanced option. It should be used carefully and clearly documented +# in a usage guide for any package that makes use of this option. +# :type NAMESPACE: string # :param ARGN: a list of export names # :type ARGN: list of strings # @@ -32,7 +37,7 @@ macro(ament_export_targets) message(FATAL_ERROR "ament_export_targets() must be called before ament_package()") endif() - cmake_parse_arguments(_ARG "HAS_LIBRARY_TARGET" "" "" ${ARGN}) + cmake_parse_arguments(_ARG "HAS_LIBRARY_TARGET" "NAMESPACE" "" ${ARGN}) if(${ARGC} GREATER 0) _ament_cmake_export_targets_register_package_hook() @@ -40,6 +45,13 @@ macro(ament_export_targets) list(APPEND _AMENT_CMAKE_EXPORT_TARGETS "${_arg}") endforeach() + set(_AMENT_CMAKE_EXPORT_TARGETS_NAMESPACE ${_ARG_NAMESPACE}) + + # Allow optionally overriding default namespace + if(NOT DEFINED _AMENT_CMAKE_EXPORT_TARGETS_NAMESPACE) + set(_AMENT_CMAKE_EXPORT_TARGETS_NAMESPACE "${PROJECT_NAME}::") + endif() + # if the export name contains is a library target # make sure to register an environment hook if(${_ARG_HAS_LIBRARY_TARGET}) From 6b310f5e3078fe4473904bac8415aa3622f8868a Mon Sep 17 00:00:00 2001 From: Michael Jeronimo Date: Thu, 8 Feb 2024 10:59:52 -0800 Subject: [PATCH 25/25] Update maintainer list in package.xml files (#503) * Update maintainer list in package.xml files * Switch the maintainer to me. Signed-off-by: Michael Jeronimo Signed-off-by: Chris Lalancette --- CODEOWNERS | 2 +- ament_cmake/package.xml | 2 +- ament_cmake_auto/package.xml | 2 +- ament_cmake_core/package.xml | 2 +- ament_cmake_export_definitions/package.xml | 2 +- ament_cmake_export_dependencies/package.xml | 2 +- ament_cmake_export_include_directories/package.xml | 2 +- ament_cmake_export_interfaces/package.xml | 2 +- ament_cmake_export_libraries/package.xml | 2 +- ament_cmake_export_link_flags/package.xml | 2 +- ament_cmake_export_targets/package.xml | 2 +- ament_cmake_gen_version_h/package.xml | 2 +- ament_cmake_gmock/package.xml | 2 +- ament_cmake_google_benchmark/package.xml | 2 +- ament_cmake_gtest/package.xml | 2 +- ament_cmake_include_directories/package.xml | 2 +- ament_cmake_libraries/package.xml | 2 +- ament_cmake_pytest/package.xml | 2 +- ament_cmake_python/package.xml | 2 +- ament_cmake_target_dependencies/package.xml | 2 +- ament_cmake_test/package.xml | 2 +- ament_cmake_vendor_package/package.xml | 2 +- ament_cmake_version/package.xml | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index e5992ac0..51837429 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ # This file was generated by https://github.com/audrow/update-ros2-repos -* @mjeronimo +* @clalancette diff --git a/ament_cmake/package.xml b/ament_cmake/package.xml index b22f7c5d..f10a709c 100644 --- a/ament_cmake/package.xml +++ b/ament_cmake/package.xml @@ -5,7 +5,7 @@ 2.3.2 The entry point package for the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_auto/package.xml b/ament_cmake_auto/package.xml index a4d27a62..f0980f35 100644 --- a/ament_cmake_auto/package.xml +++ b/ament_cmake_auto/package.xml @@ -5,7 +5,7 @@ 2.3.2 The auto-magic functions for ease to use of the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_core/package.xml b/ament_cmake_core/package.xml index 125ebe43..af786b65 100644 --- a/ament_cmake_core/package.xml +++ b/ament_cmake_core/package.xml @@ -14,7 +14,7 @@ * symlink_install: use symlinks for CMake install commands - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_export_definitions/package.xml b/ament_cmake_export_definitions/package.xml index 6f64b46a..cdbba6c4 100644 --- a/ament_cmake_export_definitions/package.xml +++ b/ament_cmake_export_definitions/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to export definitions to downstream packages in the ament buildsystem. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_export_dependencies/package.xml b/ament_cmake_export_dependencies/package.xml index a4a4f68d..a812027c 100644 --- a/ament_cmake_export_dependencies/package.xml +++ b/ament_cmake_export_dependencies/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to export dependencies to downstream packages in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_export_include_directories/package.xml b/ament_cmake_export_include_directories/package.xml index 7fb07329..951ca15d 100644 --- a/ament_cmake_export_include_directories/package.xml +++ b/ament_cmake_export_include_directories/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to export include directories to downstream packages in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_export_interfaces/package.xml b/ament_cmake_export_interfaces/package.xml index b71d1386..23f821b4 100644 --- a/ament_cmake_export_interfaces/package.xml +++ b/ament_cmake_export_interfaces/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to export interfaces to downstream packages in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_export_libraries/package.xml b/ament_cmake_export_libraries/package.xml index 828f1831..5d56fde0 100644 --- a/ament_cmake_export_libraries/package.xml +++ b/ament_cmake_export_libraries/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to export libraries to downstream packages in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_export_link_flags/package.xml b/ament_cmake_export_link_flags/package.xml index d2cb8aaf..118e880f 100644 --- a/ament_cmake_export_link_flags/package.xml +++ b/ament_cmake_export_link_flags/package.xml @@ -4,7 +4,7 @@ 2.3.2 The ability to export link flags to downstream packages in the ament buildsystem. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_export_targets/package.xml b/ament_cmake_export_targets/package.xml index ee3282a8..b8aa81f6 100644 --- a/ament_cmake_export_targets/package.xml +++ b/ament_cmake_export_targets/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to export targets to downstream packages in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_gen_version_h/package.xml b/ament_cmake_gen_version_h/package.xml index 7cd065de..1f34de57 100644 --- a/ament_cmake_gen_version_h/package.xml +++ b/ament_cmake_gen_version_h/package.xml @@ -5,7 +5,7 @@ 2.3.2 Generate a C header containing the version number of the package - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_gmock/package.xml b/ament_cmake_gmock/package.xml index 3242be25..0d19d0f8 100644 --- a/ament_cmake_gmock/package.xml +++ b/ament_cmake_gmock/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to add Google mock-based tests in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_google_benchmark/package.xml b/ament_cmake_google_benchmark/package.xml index a5595127..6582fedb 100644 --- a/ament_cmake_google_benchmark/package.xml +++ b/ament_cmake_google_benchmark/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to add Google Benchmark tests in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_gtest/package.xml b/ament_cmake_gtest/package.xml index c15a82ee..9d3ad29b 100644 --- a/ament_cmake_gtest/package.xml +++ b/ament_cmake_gtest/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to add gtest-based tests in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_include_directories/package.xml b/ament_cmake_include_directories/package.xml index 3607de6f..2a641acc 100644 --- a/ament_cmake_include_directories/package.xml +++ b/ament_cmake_include_directories/package.xml @@ -5,7 +5,7 @@ 2.3.2 The functionality to order include directories according to a chain of prefixes in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_libraries/package.xml b/ament_cmake_libraries/package.xml index 491bbe27..575855c2 100644 --- a/ament_cmake_libraries/package.xml +++ b/ament_cmake_libraries/package.xml @@ -5,7 +5,7 @@ 2.3.2 The functionality to deduplicate libraries in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_pytest/package.xml b/ament_cmake_pytest/package.xml index 2afb85a4..c5cba48d 100644 --- a/ament_cmake_pytest/package.xml +++ b/ament_cmake_pytest/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to run Python tests using pytest in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_python/package.xml b/ament_cmake_python/package.xml index d47094d4..5e4634a1 100644 --- a/ament_cmake_python/package.xml +++ b/ament_cmake_python/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to use Python in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_target_dependencies/package.xml b/ament_cmake_target_dependencies/package.xml index 5b541af4..2d881327 100644 --- a/ament_cmake_target_dependencies/package.xml +++ b/ament_cmake_target_dependencies/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to add definitions, include directories and libraries of a package to a target in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_test/package.xml b/ament_cmake_test/package.xml index 1afb49e5..2c26be77 100644 --- a/ament_cmake_test/package.xml +++ b/ament_cmake_test/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to add tests in the ament buildsystem in CMake. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_vendor_package/package.xml b/ament_cmake_vendor_package/package.xml index 31b34ff9..d2b4deb7 100644 --- a/ament_cmake_vendor_package/package.xml +++ b/ament_cmake_vendor_package/package.xml @@ -5,7 +5,7 @@ 2.3.2 Macros for maintaining a 'vendor' package. - Michael Jeronimo + Chris Lalancette Apache License 2.0 diff --git a/ament_cmake_version/package.xml b/ament_cmake_version/package.xml index 3bbd9963..5b30ba58 100644 --- a/ament_cmake_version/package.xml +++ b/ament_cmake_version/package.xml @@ -5,7 +5,7 @@ 2.3.2 The ability to override the exported package version in the ament buildsystem. - Michael Jeronimo + Chris Lalancette Apache License 2.0