Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Remove ament macros" #99

Closed
wants to merge 1 commit into from
Closed

Revert "Remove ament macros" #99

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 10 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ project(rsl VERSION 1.0.0 LANGUAGES CXX DESCRIPTION "ROS Support Library")

set(CMAKE_CXX_EXTENSIONS OFF)

find_package(ament_cmake_ros REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(fmt REQUIRED)
find_package(rclcpp REQUIRED)
Expand All @@ -13,8 +14,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
add_compile_options(-Werror -Wall -Wextra -Wpedantic -Wshadow -Wconversion -Wsign-conversion -Wold-style-cast)
endif()

option(BUILD_SHARED_LIBS "Build shared libraries" ON)

add_library(rsl
src/parameter_validators.cpp
src/random.cpp
Expand Down Expand Up @@ -49,15 +48,15 @@ install(
RUNTIME DESTINATION bin
INCLUDES DESTINATION include/rsl
)
install(
EXPORT rsl-targets
NAMESPACE rsl::
DESTINATION share/rsl/cmake
)
write_basic_package_version_file(rsl-config-version.cmake COMPATIBILITY SameMajorVersion)
install(
FILES cmake/rsl-config.cmake ${PROJECT_BINARY_DIR}/rsl-config-version.cmake
DESTINATION share/rsl/cmake

ament_export_targets(rsl-targets HAS_LIBRARY_TARGET)
ament_export_dependencies(
Eigen3
fmt
rclcpp
tcb_span
tl_expected
)
ament_package()

add_custom_target(tidy COMMAND run-clang-tidy -p ${CMAKE_BINARY_DIR})
9 changes: 0 additions & 9 deletions cmake/rsl-config.cmake
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<maintainer email="chrisjthrasher@gmail.com">Chris Thrasher</maintainer>
<license>BSD-3-Clause</license>

<buildtool_depend>ament_cmake_ros</buildtool_depend>
<buildtool_depend>doxygen</buildtool_depend>

<depend>eigen</depend>
Expand All @@ -23,4 +24,8 @@
<test_depend>clang-tidy</test_depend>
<test_depend>git</test_depend>
<test_depend>range-v3</test_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>