Skip to content

Commit 0a77a01

Browse files
committed
update win patch
Signed-off-by: wep21 <[email protected]>
1 parent 46e65f7 commit 0a77a01

File tree

2 files changed

+10
-24
lines changed

2 files changed

+10
-24
lines changed
Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/ur_calibration/CMakeLists.txt b/ur_calibration/CMakeLists.txt
2-
index 0b17e4d5f..31c63864f 100644
3-
--- a/ur_calibration/CMakeLists.txt
4-
+++ b/ur_calibration/CMakeLists.txt
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index e95014a1..e39dde40 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
55
@@ -2,10 +2,9 @@ cmake_minimum_required(VERSION 3.5)
66
project(ur_calibration)
77

@@ -15,17 +15,3 @@ index 0b17e4d5f..31c63864f 100644
1515

1616
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
1717
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 0b17e4d5f..8b8bbf871 100644
21-
--- a/ur_calibration/CMakeLists.txt
22-
+++ b/ur_calibration/CMakeLists.txt
23-
@@ -37,7 +37,7 @@ target_include_directories(calibration
24-
${YAML_CPP_INCLUDE_DIRS}
25-
)
26-
target_link_libraries(calibration
27-
- ${YAML_CPP_LIBRARIES}
28-
+ yaml-cpp::yaml-cpp
29-
)
30-
ament_target_dependencies(calibration
31-
rclcpp

patch/ros-jazzy-ur-controllers.win.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/ur_controllers/CMakeLists.txt b/ur_controllers/CMakeLists.txt
2-
index 79a89acbd..9e4584419 100644
3-
--- a/ur_controllers/CMakeLists.txt
4-
+++ b/ur_controllers/CMakeLists.txt
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 3db6e822..52fb849b 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
55
@@ -4,6 +4,7 @@ project(ur_controllers)
66
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
77
add_compile_options(-Wall -Wextra)
@@ -14,9 +14,9 @@ index 79a89acbd..9e4584419 100644
1414
${THIS_PACKAGE_INCLUDE_DEPENDS}
1515
)
1616

17-
-target_compile_options(${PROJECT_NAME} PRIVATE -Wpedantic -Werror=return-type)
17+
-target_compile_options(${PROJECT_NAME} PRIVATE -Wpedantic -Werror)
1818
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
19-
+ target_compile_options(${PROJECT_NAME} PRIVATE -Wpedantic -Werror=return-type)
19+
+ target_compile_options(${PROJECT_NAME} PRIVATE -Wpedantic -Werror)
2020
+endif()
2121

2222
# prevent pluginlib from using boost

0 commit comments

Comments
 (0)