Skip to content

Commit f0e67ce

Browse files
authored
[sbp] Update to v6.3.2 (#48274)
1 parent 03e9d1a commit f0e67ce

File tree

7 files changed

+35
-32
lines changed

7 files changed

+35
-32
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/c/src/CMakeLists.txt b/c/src/CMakeLists.txt
2+
index dc59feffa..93d6c8dc7 100644
3+
--- a/c/src/CMakeLists.txt
4+
+++ b/c/src/CMakeLists.txt
5+
@@ -53,7 +53,7 @@ target_include_directories(sbp
6+
PUBLIC
7+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
8+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
9+
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
10+
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
11+
PRIVATE
12+
${CMAKE_CURRENT_SOURCE_DIR}/include
13+
)

ports/sbp/portfile.cmake

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ vcpkg_from_github(
88
OUT_SOURCE_PATH SOURCE_PATH
99
REPO swift-nav/libsbp
1010
REF "v${VERSION}"
11-
SHA512 2fb5daead688501280fae24fda62e58a4769f04006554faaef91cb1b8340adb9f1cc5e57e7ad13f8ca24bb538f1f3ec2d228cd17bba0c246a57075c671866ccd
11+
SHA512 2dc626cc1667da271bca565f499471de0ec0d533694ffee1c72f25f8ba4a8944294cea67b8a35b48da80c66da623e23bc92a0a7478a6882b72485761fca36417
1212
HEAD_REF master
13+
PATCHES
14+
0000-install-include-directory.patch
1315
)
1416

1517
vcpkg_from_github(
1618
OUT_SOURCE_PATH CMAKE_EXTRA_MODS
1719
REPO swift-nav/cmake
18-
REF 65c9a396568701c382ca5a5515e6bb598f7d61b2
19-
SHA512 e8b1b1e48c7f6d71b156668ba6e0c0898d6a9b6c9e86bc63cb2b5a4cffa844a0a9a175699db8417bcb70bc4c6b278d32327f5c709e7db7b69ab2a81e7c398b23
20+
REF d5558e3ad3c2cdabfb1ba31d20ea4defce570a95
21+
SHA512 50c49b808b774c3fec1dd4488713f8fde423fda1d7e34a9ea8ecabc738d19f31ce8d52928c9d8012921d69130526ebd327635b1d4ca43f1b452066191c8756b7
2022
HEAD_REF master
2123
)
2224

@@ -40,6 +42,12 @@ vcpkg_cmake_configure(
4042
)
4143

4244
vcpkg_cmake_install()
45+
46+
vcpkg_cmake_config_fixup(CONFIG_PATH share/libsbp/cmake PACKAGE_NAME libsbp)
47+
4348
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
4449

50+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
51+
4552
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
53+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

ports/sbp/usage

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
sbp provides CMake targets:
2+
3+
find_package(libsbp CONFIG REQUIRED)
4+
target_link_libraries(main PRIVATE swiftnav::sbp)

ports/sbp/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sbp",
3-
"version-semver": "6.3.1",
3+
"version-semver": "6.3.2",
44
"description": "Swift Navigation Binary Protocol (SBP) is a binary protocol for communicating GNSS data used by Piksi devices.",
55
"homepage": "https://github.com/swift-nav/libsbp",
66
"documentation": "https://swift-nav.github.io/libsbp",

ports/sbp/win32-install-fix.patch

Lines changed: 0 additions & 27 deletions
This file was deleted.

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8745,7 +8745,7 @@
87458745
"port-version": 0
87468746
},
87478747
"sbp": {
8748-
"baseline": "6.3.1",
8748+
"baseline": "6.3.2",
87498749
"port-version": 0
87508750
},
87518751
"scenepic": {

versions/s-/sbp.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "7e3b78a7ac29e9c3fa12f74fc39eceaffffdb87b",
5+
"version-semver": "6.3.2",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "acb3bbd2ee6a15dd3254417f32b2268490b1be6c",
510
"version-semver": "6.3.1",

0 commit comments

Comments
 (0)