|
1 | 1 | diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
| -index 0b17e4d5..9ace1736 100644 |
| 2 | +index e95014a1..8dbdd64d 100644 |
3 | 3 | --- a/CMakeLists.txt
|
4 | 4 | +++ b/CMakeLists.txt
|
5 |
| -@@ -2,10 +2,9 @@ cmake_minimum_required(VERSION 3.5) |
6 |
| - project(ur_calibration) |
7 |
| - |
8 |
| - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") |
9 |
| -- add_compile_options(-Wall -Wextra -Wpedantic) |
10 |
| -+ add_compile_options(-Wall -Wextra -Wpedantic -Wno-unused-parameter) |
| 5 | +@@ -5,7 +5,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") |
| 6 | + add_compile_options(-Wall -Wextra -Wpedantic) |
11 | 7 | endif()
|
12 |
| -- |
| 8 | + |
13 | 9 | -add_compile_options(-Wno-unused-parameter)
|
14 | 10 | +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
15 | 11 |
|
16 | 12 | if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
|
17 | 13 | message("${PROJECT_NAME}: You did not request a specific build type: selecting 'RelWithDebInfo'.")
|
18 |
| - |
19 |
| -diff --git a/ur_calibration/CMakeLists.txt b/ur_calibration/CMakeLists.txt |
20 |
| -index 1f6bd0d9e..42de20644 100644 |
21 |
| ---- a/ur_calibration/CMakeLists.txt |
22 |
| -+++ b/ur_calibration/CMakeLists.txt |
23 |
| -@@ -37,11 +37,16 @@ target_include_directories(calibration |
24 |
| - target_link_libraries(calibration |
25 |
| - ur_client_library::urcl |
26 |
| - Eigen3::Eigen |
27 |
| -- yaml-cpp |
28 |
| - rclcpp::rclcpp |
29 |
| - ur_robot_driver::ur_robot_driver_log_handler |
| 14 | +@@ -33,9 +33,11 @@ target_include_directories(calibration |
| 15 | + include |
| 16 | + ${EIGEN3_INCLUDE_DIRS} |
30 | 17 | )
|
31 |
| - |
| 18 | +-target_link_libraries(calibration |
| 19 | +- yaml-cpp |
| 20 | +-) |
32 | 21 | +if(TARGET yaml-cpp::yaml-cpp)
|
33 | 22 | + target_link_libraries(calibration yaml-cpp::yaml-cpp)
|
34 | 23 | +else()
|
35 | 24 | + target_link_libraries(calibration yaml-cpp)
|
36 | 25 | +endif()
|
37 |
| -+ |
38 |
| - add_executable(calibration_correction |
39 |
| - src/calibration_correction.cpp |
40 |
| - ) |
| 26 | + ament_target_dependencies(calibration |
| 27 | + rclcpp |
| 28 | + ur_robot_driver |
0 commit comments