Skip to content

Commit a0fc8c5

Browse files
committed
add ublox serialization win patch
Signed-off-by: wep21 <daisuke.nishimatsu1021@gmail.com>
1 parent 47d9d25 commit a0fc8c5

File tree

2 files changed

+52
-1
lines changed

2 files changed

+52
-1
lines changed

patch/ros-jazzy-ublox-msgs.win.patch

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index e4c03c0..c77f681 100644
2+
index e4c03c0..5f18382 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -10,6 +10,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -11,6 +11,44 @@ index e4c03c0..c77f681 100644
1111
find_package(ament_cmake_ros REQUIRED)
1212
find_package(rosidl_default_generators REQUIRED)
1313
find_package(sensor_msgs REQUIRED)
14+
@@ -108,12 +110,16 @@ if(cpp_typesupport_target)
15+
add_library(${PROJECT_NAME}_lib src/ublox_msgs.cpp)
16+
target_include_directories(${PROJECT_NAME}_lib PRIVATE
17+
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
18+
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
19+
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
20+
target_link_libraries(${PROJECT_NAME}_lib
21+
${cpp_typesupport_target}
22+
ublox_serialization::ublox_serialization
23+
)
24+
25+
+ include(GenerateExportHeader)
26+
+ generate_export_header(${PROJECT_NAME}_lib BASE_NAME ublox_serialization)
27+
+
28+
install(TARGETS ${PROJECT_NAME}_lib EXPORT ${PROJECT_NAME}_lib
29+
ARCHIVE DESTINATION lib
30+
LIBRARY DESTINATION lib
31+
@@ -124,6 +130,8 @@ if(cpp_typesupport_target)
32+
DESTINATION "include/${PROJECT_NAME}"
33+
)
34+
35+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ublox_serialization_export.h DESTINATION include)
36+
+
37+
ament_export_include_directories("include/${PROJECT_NAME}")
38+
ament_export_libraries(${PROJECT_NAME}_lib)
39+
ament_export_targets(${PROJECT_NAME}_lib)
40+
diff --git a/include/ublox_msgs/serialization.hpp b/include/ublox_msgs/serialization.hpp
41+
index 9ef607f..980f920 100644
42+
--- a/include/ublox_msgs/serialization.hpp
43+
+++ b/include/ublox_msgs/serialization.hpp
44+
@@ -32,6 +32,7 @@
45+
46+
#include <cstdint>
47+
48+
+#include <ublox_serialization_export.h>
49+
#include <ublox_serialization/serialization.hpp>
50+
#include <ublox_msgs/ublox_msgs.hpp>
51+
1452
diff --git a/include/ublox_msgs/ublox_msgs.hpp b/include/ublox_msgs/ublox_msgs.hpp
1553
index d362c8d..761a08c 100644
1654
--- a/include/ublox_msgs/ublox_msgs.hpp
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/include/ublox_serialization/serialization.hpp b/include/ublox_serialization/serialization.hpp
2+
index b04fc81..ba3ef08 100644
3+
--- a/include/ublox_serialization/serialization.hpp
4+
+++ b/include/ublox_serialization/serialization.hpp
5+
@@ -324,7 +324,7 @@ class Message {
6+
};
7+
8+
private:
9+
- static std::vector<std::pair<uint8_t,uint8_t> > keys_;
10+
+ static UBLOX_SERIALIZATION_EXPORT std::vector<std::pair<uint8_t,uint8_t> > keys_;
11+
};
12+
13+
/**

0 commit comments

Comments
 (0)