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

fix: remove non-ros dependency #6

Merged
merged 5 commits into from
Feb 17, 2025
Merged

fix: remove non-ros dependency #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84c8621
fix: remove non-ros dependency
incebellipipo Apr 1, 2024
c98785b
fix: rrecplace submodule with fetch content
incebellipipo Apr 1, 2024
0d619db
fix: remove undeclared include directive
incebellipipo Apr 1, 2024
9cc39c8
chore: fix build error downstream
incebellipipo Feb 11, 2025
21e6863
Merge branch 'MOCAP4ROS2-Project:rolling' into main
incebellipipo Feb 11, 2025
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
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion qualisys_cpp_sdk
Open in desktop
Submodule qualisys_cpp_sdk deleted from be1dfb
20 changes: 13 additions & 7 deletions qualisys_driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
endif()

set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/cmake/modules")
set(QUALISYS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/qualisys_cpp_sdk")

find_package(QUALISYSSDK REQUIRED)
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(rclcpp_lifecycle REQUIRED)
Expand All @@ -24,6 +22,19 @@ find_package(mocap4r2_msgs REQUIRED)
find_package(geometry_msgs REQUIRED)


include(FetchContent)
if (NOT TARGET qualisys_cpp_sdk)
message(STATUS "${PROJECT_NAME}: `qualisys_cpp_sdk` targets not found. Attempting to fetch contents...")
FetchContent_Declare(
qualisys_cpp_sdk
GIT_REPOSITORY https://github.com/incebellipipo/qualisys_cpp_sdk
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should ideally be a fork and it should be something like: mocap4ros2/qualisys_cpp_sdk
@fmrico

GIT_TAG master
)
FetchContent_MakeAvailable(qualisys_cpp_sdk)
else()
message(STATUS "qualisys_cpp_sdk: `qualisys_cpp_sdk` targets found.")
endif()

set(dependencies
rclcpp
rclcpp_lifecycle
Expand All @@ -34,16 +45,11 @@ set(dependencies

include_directories(
include
${QUALISYSSDK_INCLUDE_DIR}
)

add_library(${PROJECT_NAME} STATIC src/qualisys_driver.cpp)
ament_target_dependencies(${PROJECT_NAME} ${dependencies})

add_library(qualisys_cpp_sdk STATIC IMPORTED)
set_target_properties(qualisys_cpp_sdk PROPERTIES
IMPORTED_LOCATION ${QUALISYSSDK_LIBRARY})

add_executable(qualisys_driver_main
src/qualisys_driver_main.cpp
)
Expand Down
1 change: 0 additions & 1 deletion qualisys_driver/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<build_depend>tf2_msgs</build_depend>
<build_depend>geometry_msgs</build_depend>
<build_depend>mocap4r2_msgs</build_depend>
<build_depend>qualisys_cpp_sdk</build_depend>

<exec_depend>geometry_msgs</exec_depend>
<exec_depend>rclcpp</exec_depend>
Expand Down