Skip to content

Add ament_ros_defaults target #62

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
skyegalaxy merged 8 commits into from
Apr 17, 2026
Merged

Add ament_ros_defaults target #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7ad436b
Init
InvincibleRMC Mar 25, 2026
1cfe7a5
Move into seperate file
InvincibleRMC Mar 25, 2026
118fc8b
nits + c17
InvincibleRMC Mar 28, 2026
4626b1f
Add other defaults
InvincibleRMC Mar 28, 2026
8bea02e
Add missing targets to export
InvincibleRMC Mar 28, 2026
e8b166e
Apply suggestion from @ahcorde
InvincibleRMC Apr 2, 2026
f290f98
Remove duped package name + build settings
InvincibleRMC Apr 8, 2026
82c3513
Remove other targets and REQUIRED property
InvincibleRMC Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ament_cmake_ros_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ project(ament_cmake_ros_core NONE)

find_package(ament_cmake_core REQUIRED)
find_package(ament_cmake_export_dependencies REQUIRED)
find_package(ament_cmake_export_targets REQUIRED)

ament_export_dependencies(ament_cmake_core)

Expand All @@ -12,6 +13,20 @@ if(BUILD_TESTING)
ament_lint_auto_find_test_dependencies()
endif()

include("${CMAKE_CURRENT_LIST_DIR}/cmake/ament_ros_defaults.cmake")

install(
TARGETS
ament_ros_defaults
ament_ros_cxx_standard
ament_ros_c_standard
EXPORT ament_ros_core_targets
)

ament_export_targets(
ament_ros_core_targets
)

ament_package(
CONFIG_EXTRAS "ament_cmake_ros_core-extras.cmake.in"
)
Expand Down
25 changes: 25 additions & 0 deletions ament_cmake_ros_core/cmake/ament_ros_defaults.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright 2026 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_library(ament_ros_cxx_standard INTERFACE)
target_compile_features(ament_ros_cxx_standard INTERFACE cxx_std_20)

add_library(ament_ros_c_standard INTERFACE)
target_compile_features(ament_ros_c_standard INTERFACE c_std_17)

add_library(ament_ros_defaults INTERFACE)
target_link_libraries(ament_ros_defaults INTERFACE
ament_ros_cxx_standard
ament_ros_c_standard
)
1 change: 1 addition & 0 deletions ament_cmake_ros_core/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

<buildtool_depend>ament_cmake_core</buildtool_depend>
<buildtool_depend>ament_cmake_export_dependencies</buildtool_depend>
<buildtool_depend>ament_cmake_export_targets</buildtool_depend>

<buildtool_export_depend>ament_cmake_core</buildtool_export_depend>
<buildtool_export_depend>ament_cmake_libraries</buildtool_export_depend>
Expand Down
8 changes: 3 additions & 5 deletions rmw_test_fixture_implementation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
cmake_minimum_required(VERSION 3.20)
project(rmw_test_fixture_implementation LANGUAGES C CXX)

# Default to C++17
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
endif()

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()
Expand Down Expand Up @@ -50,6 +45,7 @@ target_compile_definitions(rmw_test_fixture_implementation PRIVATE
"RMW_TEST_FIXTURE_BUILDING_DLL"
)
target_link_libraries(rmw_test_fixture_implementation PRIVATE
ament_cmake_ros_core::ament_ros_defaults
rcpputils::rcpputils
rcutils::rcutils
rmw::rmw
Expand All @@ -72,6 +68,7 @@ add_executable(run_rmw_isolated
src/run_rmw_isolated.c
)
target_link_libraries(run_rmw_isolated
ament_cmake_ros_core::ament_ros_defaults
rcutils::rcutils
rmw_test_fixture_implementation
)
Expand All @@ -94,6 +91,7 @@ if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
endif()

target_link_libraries(_rmw_test_fixture_implementation PRIVATE
ament_cmake_ros_core::ament_ros_defaults
rcutils::rcutils
rmw::rmw
rmw_test_fixture_implementation
Expand Down
3 changes: 3 additions & 0 deletions rmw_test_fixture_implementation/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
find_package(ament_cmake_gtest REQUIRED)
find_package(ament_cmake_pytest REQUIRED)
find_package(ament_cmake_ros_core REQUIRED)

add_library(rmw_mockmock_test_fixture SHARED
rmw_mockmock_test_fixture.c
Expand All @@ -11,6 +12,7 @@ target_compile_definitions(rmw_mockmock_test_fixture PRIVATE

target_link_libraries(rmw_mockmock_test_fixture
PRIVATE
ament_cmake_ros_core::ament_ros_defaults
Comment thread
InvincibleRMC marked this conversation as resolved.
rcutils::rcutils
rmw_test_fixture::rmw_test_fixture
)
Expand All @@ -24,6 +26,7 @@ ament_add_gtest(test_fixture_start_stop
)

target_link_libraries(test_fixture_start_stop
ament_cmake_ros_core::ament_ros_defaults
rcpputils::rcpputils
rmw_test_fixture::rmw_test_fixture
rmw_test_fixture_implementation
Expand Down