Skip to content

Commit 0a47690

Browse files
committed
patch update
Signed-off-by: wep21 <[email protected]>
1 parent c580214 commit 0a47690

File tree

1 file changed

+27
-4
lines changed

1 file changed

+27
-4
lines changed

patch/ros-humble-ur-client-library.patch

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 878ffed..82ba8d5 100644
2+
index 878ffed..a1b176e 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -1,4 +1,4 @@
@@ -22,16 +22,21 @@ index 878ffed..82ba8d5 100644
2222
add_library(urcl SHARED
2323
src/comm/tcp_socket.cpp
2424
src/comm/tcp_server.cpp
25-
@@ -52,7 +45,7 @@ add_library(urcl SHARED
25+
@@ -51,8 +44,11 @@ add_library(urcl SHARED
26+
src/helpers.cpp
2627
)
2728
add_library(ur_client_library::urcl ALIAS urcl)
28-
target_compile_options(urcl PRIVATE -Wall -Wextra -Wno-unused-parameter)
29+
-target_compile_options(urcl PRIVATE -Wall -Wextra -Wno-unused-parameter)
2930
-target_compile_options(urcl PUBLIC ${CXX17_FLAG})
31+
+target_compile_options(urcl PRIVATE
32+
+ $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
33+
+ $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wno-unused-parameter>
34+
+)
3035
+target_compile_options(urcl PUBLIC cxx_std_17)
3136
if(WITH_ASAN)
3237
target_compile_options(urcl PUBLIC -fsanitize=address)
3338
target_link_options(urcl PUBLIC -fsanitize=address)
34-
@@ -69,6 +62,9 @@ endif()
39+
@@ -69,6 +65,9 @@ endif()
3540
if(CMAKE_THREAD_LIBS_INIT)
3641
target_link_libraries(urcl PUBLIC "${CMAKE_THREAD_LIBS_INIT}")
3742
endif()
@@ -41,6 +46,24 @@ index 878ffed..82ba8d5 100644
4146

4247
##
4348
## Build testing if enabled by option
49+
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
50+
index eb4c313..6972cf4 100644
51+
--- a/examples/CMakeLists.txt
52+
+++ b/examples/CMakeLists.txt
53+
@@ -3,13 +3,6 @@ project(ur_driver_examples)
54+
55+
# find_package(ur_client_library REQUIRED)
56+
57+
-# #
58+
-# # Check C++11 support / enable global pedantic and Wall
59+
-# #
60+
-include(DefineCXX17CompilerFlag)
61+
-DEFINE_CXX_17_COMPILER_FLAG(CXX17_FLAG)
62+
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
63+
-
64+
add_executable(driver_example
65+
full_driver.cpp)
66+
target_compile_options(driver_example PUBLIC ${CXX17_FLAG})
4467
diff --git a/include/ur_client_library/comm/bin_parser.h b/include/ur_client_library/comm/bin_parser.h
4568
index e13aba6..83f8e6c 100644
4669
--- a/include/ur_client_library/comm/bin_parser.h

0 commit comments

Comments
 (0)