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.

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

Fix cmake to defein ROS_DISTRO and HUMBLE #71

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
Fix cmake to defein ROS_DISTRO and HUMBLE
Fei Name committed Aug 28, 2024
commit 5f20efa3292b8ef97b324609e28da31fc3d93f13
1 change: 0 additions & 1 deletion rmw_ecal_dynamic_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -58,7 +58,6 @@ add_library(${PROJECT_NAME} SHARED
src/rmw/init.cpp
src/rmw/qos_profiles.cpp
src/rmw/rmw.cpp
src/rmw/features.cpp
src/serialization/serializer_cpp.cpp
src/serialization/serializer_c.cpp
src/serialization/deserializer_cpp.cpp
26 changes: 0 additions & 26 deletions rmw_ecal_dynamic_cpp/src/rmw/features.cpp

This file was deleted.

1 change: 0 additions & 1 deletion rmw_ecal_proto_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -64,7 +64,6 @@ add_library(${PROJECT_NAME} SHARED
src/rmw/init.cpp
src/rmw/qos_profiles.cpp
src/rmw/rmw.cpp
src/rmw/features.cpp
)

target_link_libraries(${PROJECT_NAME}
26 changes: 0 additions & 26 deletions rmw_ecal_proto_cpp/src/rmw/features.cpp

This file was deleted.

3 changes: 2 additions & 1 deletion rmw_ecal_shared_cpp/cmake/discover-ros-distro-extras.cmake
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@ set(supported_distros
list(FIND supported_distros $ENV{ROS_DISTRO} index)
if(index EQUAL -1)
message(FATAL_ERROR "'$ENV{ROS_DISTRO}' is an unsupported ros2 distro.")
else()
add_compile_definitions("ROS_DISTRO=${index}")
endif()

set(distro_index 0)
@@ -34,4 +36,3 @@ foreach(distro ${supported_distros})
MATH(EXPR distro_index "${distro_index}+1")
endforeach()

add_compile_definitions("ROS_DISTRO=$<UPPER_CASE:$ENV{ROS_DISTRO}>")
6 changes: 4 additions & 2 deletions rmw_ecal_shared_cpp/src/features.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#if DISTRO >= HUMBLE
#if ROS_DISTRO >= HUMBLE

#include <rmw/features.h>

#include <rmw_ecal_shared_cpp/rmw/rmw.hpp>

bool rmw_feature_supported(rmw_feature_t feature)
{
return false;
return eCAL::rmw::rmw_feature_supported(feature);
}

#endif