Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/sbp/0000-install-include-directory.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/c/src/CMakeLists.txt b/c/src/CMakeLists.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I submitted upstream as swift-nav/libsbp#1537

index dc59feffa..93d6c8dc7 100644
--- a/c/src/CMakeLists.txt
+++ b/c/src/CMakeLists.txt
@@ -53,7 +53,7 @@ target_include_directories(sbp
PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/include
)
14 changes: 11 additions & 3 deletions ports/sbp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO swift-nav/libsbp
REF "v${VERSION}"
SHA512 2fb5daead688501280fae24fda62e58a4769f04006554faaef91cb1b8340adb9f1cc5e57e7ad13f8ca24bb538f1f3ec2d228cd17bba0c246a57075c671866ccd
SHA512 2dc626cc1667da271bca565f499471de0ec0d533694ffee1c72f25f8ba4a8944294cea67b8a35b48da80c66da623e23bc92a0a7478a6882b72485761fca36417
HEAD_REF master
PATCHES
0000-install-include-directory.patch
)

vcpkg_from_github(
OUT_SOURCE_PATH CMAKE_EXTRA_MODS
REPO swift-nav/cmake
REF 65c9a396568701c382ca5a5515e6bb598f7d61b2
SHA512 e8b1b1e48c7f6d71b156668ba6e0c0898d6a9b6c9e86bc63cb2b5a4cffa844a0a9a175699db8417bcb70bc4c6b278d32327f5c709e7db7b69ab2a81e7c398b23
REF d5558e3ad3c2cdabfb1ba31d20ea4defce570a95
SHA512 50c49b808b774c3fec1dd4488713f8fde423fda1d7e34a9ea8ecabc738d19f31ce8d52928c9d8012921d69130526ebd327635b1d4ca43f1b452066191c8756b7
HEAD_REF master
)

Expand All @@ -40,6 +42,12 @@ vcpkg_cmake_configure(
)

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(CONFIG_PATH share/libsbp/cmake PACKAGE_NAME libsbp)

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
4 changes: 4 additions & 0 deletions ports/sbp/usage
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
sbp provides CMake targets:

find_package(libsbp CONFIG REQUIRED)
target_link_libraries(main PRIVATE swiftnav::sbp)
2 changes: 1 addition & 1 deletion ports/sbp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sbp",
"version-semver": "6.3.1",
"version-semver": "6.3.2",
"description": "Swift Navigation Binary Protocol (SBP) is a binary protocol for communicating GNSS data used by Piksi devices.",
"homepage": "https://github.com/swift-nav/libsbp",
"documentation": "https://swift-nav.github.io/libsbp",
Expand Down
27 changes: 0 additions & 27 deletions ports/sbp/win32-install-fix.patch

This file was deleted.

2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8745,7 +8745,7 @@
"port-version": 0
},
"sbp": {
"baseline": "6.3.1",
"baseline": "6.3.2",
"port-version": 0
},
"scenepic": {
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sbp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7e3b78a7ac29e9c3fa12f74fc39eceaffffdb87b",
"version-semver": "6.3.2",
"port-version": 0
},
{
"git-tree": "acb3bbd2ee6a15dd3254417f32b2268490b1be6c",
"version-semver": "6.3.1",
Expand Down