From da72d8b596bf955644da2f45128b989a2aafd394 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Tue, 17 Oct 2023 14:28:44 -0400 Subject: [PATCH 01/14] successful .deb if you remove examples --- src/viam/CMakeLists.txt | 1 - src/viam/sdk/CMakeLists.txt | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/viam/CMakeLists.txt b/src/viam/CMakeLists.txt index c8c712426..745b618fe 100644 --- a/src/viam/CMakeLists.txt +++ b/src/viam/CMakeLists.txt @@ -14,7 +14,6 @@ add_subdirectory(api) add_subdirectory(sdk) -add_subdirectory(examples) # Generate CMake configs to enable importing this project # into others via `find_package`. diff --git a/src/viam/sdk/CMakeLists.txt b/src/viam/sdk/CMakeLists.txt index 8da617bba..09c50ac5d 100644 --- a/src/viam/sdk/CMakeLists.txt +++ b/src/viam/sdk/CMakeLists.txt @@ -249,3 +249,9 @@ install(FILES add_subdirectory(tests) + +set(CPACK_GENERATOR "DEB") +set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) +set(CPACK_COMPONENTS_ALL viam-cpp-sdk_dev) +set(CPACK_PACKAGE_CONTACT "OY TIS") +include(CPack) From 1d6bba7fbc1ccde4e125ce34c5dfc9935ff26cfa Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Fri, 20 Oct 2023 15:30:36 -0400 Subject: [PATCH 02/14] debian packaging workflow --- .github/workflows/debian.yml | 55 ++++++++++++++++++++++++++++++++++++ src/viam/CMakeLists.txt | 1 + src/viam/sdk/CMakeLists.txt | 3 +- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/debian.yml diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml new file mode 100644 index 000000000..b008f1055 --- /dev/null +++ b/.github/workflows/debian.yml @@ -0,0 +1,55 @@ +on: + push: + +env: + CMAKE_VERSION: 3.27.4 + +jobs: + build-deb: + strategy: + matrix: + include: + - container: debian:bookworm + label: bookworm-aarch64 + runs-on: buildjet-8vcpu-ubuntu-2204-arm + - container: debian:bookworm + label: bookworm-x86_64 + runs-on: buildjet-8vcpu-ubuntu-2204 + container: ${{ matrix.container }} + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v3 + - name: depends + run: | + apt-get update + apt-get install -qqy \ + build-essential \ + libabsl-dev \ + libboost-all-dev \ + libgrpc++-dev \ + libprotobuf-dev \ + pkg-config \ + ninja-build \ + protobuf-compiler-grpc \ + git \ + wget + - name: download cmake + run: | + ARCH=$(uname -m) + wget --quiet https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$ARCH.sh + chmod +x cmake-${CMAKE_VERSION}-linux-$ARCH.sh + ./cmake-${CMAKE_VERSION}-linux-$ARCH.sh --skip-license --prefix=/usr + - name: remove examples + run: sed -i '/add_subdirectory.examples/d' src/viam/CMakeLists.txt + - name: create build + run: mkdir build + - name: cmake + working-directory: ./build + run: cmake .. -G Ninja + - name: build + working-directory: ./build + run: ninja libviamsdk.so && cpack + - uses: actions/upload-artifact@v3 + with: + name: debian-${{ matrix.label }} + path: build/viam-cpp-sdk-*.deb diff --git a/src/viam/CMakeLists.txt b/src/viam/CMakeLists.txt index 745b618fe..c8c712426 100644 --- a/src/viam/CMakeLists.txt +++ b/src/viam/CMakeLists.txt @@ -14,6 +14,7 @@ add_subdirectory(api) add_subdirectory(sdk) +add_subdirectory(examples) # Generate CMake configs to enable importing this project # into others via `find_package`. diff --git a/src/viam/sdk/CMakeLists.txt b/src/viam/sdk/CMakeLists.txt index 09c50ac5d..874bbc95c 100644 --- a/src/viam/sdk/CMakeLists.txt +++ b/src/viam/sdk/CMakeLists.txt @@ -253,5 +253,6 @@ add_subdirectory(tests) set(CPACK_GENERATOR "DEB") set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) set(CPACK_COMPONENTS_ALL viam-cpp-sdk_dev) -set(CPACK_PACKAGE_CONTACT "OY TIS") +set(CPACK_PACKAGE_CONTACT "packaging@viam.com") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "libprotobuf32, libgrpc++1.51, libabsl20220623") include(CPack) From 40be3cb866d0c13bfd24e6a7b6abe56f28164412 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Fri, 20 Oct 2023 16:38:34 -0400 Subject: [PATCH 03/14] hardcode prefix, lowercase grpc --- src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in | 2 +- src/viam/sdk/CMakeLists.txt | 1 + src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in index 6033e512e..f8f968092 100644 --- a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in +++ b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in @@ -7,7 +7,7 @@ Name: @PROJECT_NAME@-libapi Description: @PROJECT_DESCRIPTION@ URL: @PROJECT_HOMEPAGE_URL@ Version: @PROJECT_VERSION@ -Requires: gRPC++ >= @VIAMCPPSDK_GRPCXX_VERSION@ protobuf >= @VIAMCPPSDK_PROTOBUF_VERSION@ +Requires: grpc++ >= @VIAMCPPSDK_GRPCXX_VERSION@ protobuf >= @VIAMCPPSDK_PROTOBUF_VERSION@ Libs: -L${libdir} -L@Boost_LIBRARY_DIRS@ -lviamapi Cflags: -I${base_includedir} -I${deep_includedir} diff --git a/src/viam/sdk/CMakeLists.txt b/src/viam/sdk/CMakeLists.txt index 874bbc95c..ea943f564 100644 --- a/src/viam/sdk/CMakeLists.txt +++ b/src/viam/sdk/CMakeLists.txt @@ -255,4 +255,5 @@ set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) set(CPACK_COMPONENTS_ALL viam-cpp-sdk_dev) set(CPACK_PACKAGE_CONTACT "packaging@viam.com") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libprotobuf32, libgrpc++1.51, libabsl20220623") +set(CPACK_PACKAGING_INSTALL_PREFIX "/usr") include(CPack) diff --git a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in index 98061c1bd..005af602e 100644 --- a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in +++ b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in @@ -6,7 +6,7 @@ Name: @PROJECT_NAME@-libviamsdk Description: @PROJECT_DESCRIPTION@ URL: @PROJECT_HOMEPAGE_URL@ Version: @PROJECT_VERSION@ -Requires: gRPC++ >= @VIAMCPPSDK_GRPCXX_VERSION@ protobuf >= @VIAMCPPSDK_PROTOBUF_VERSION@ @PROJECT_NAME@-libviamapi >= @PROJECT_VERSION@ +Requires: grpc++ >= @VIAMCPPSDK_GRPCXX_VERSION@ protobuf >= @VIAMCPPSDK_PROTOBUF_VERSION@ @PROJECT_NAME@-libviamapi >= @PROJECT_VERSION@ Libs: -L${libdir} -L@Boost_LIBRARY_DIRS@ -lviamsdk -lviam_rust_utils Libs.private: -lboost_log-mt Cflags: -I${includedir} -I@Boost_INCLUDE_DIR@ From 2bbd11982528825823b10d2664c7b1518ec109aa Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Fri, 20 Oct 2023 16:55:03 -0400 Subject: [PATCH 04/14] dev deps for dpkg, pkg-config fixes --- src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in | 2 +- src/viam/sdk/CMakeLists.txt | 3 +-- src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in index f8f968092..c547fc134 100644 --- a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in +++ b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in @@ -1,4 +1,4 @@ -prefix=@CMAKE_INSTALL_PREFIX@ +prefix=@CPACK_PACKAGING_INSTALL_PREFIX@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ base_includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ deep_includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/viam/api diff --git a/src/viam/sdk/CMakeLists.txt b/src/viam/sdk/CMakeLists.txt index ea943f564..08121d876 100644 --- a/src/viam/sdk/CMakeLists.txt +++ b/src/viam/sdk/CMakeLists.txt @@ -254,6 +254,5 @@ set(CPACK_GENERATOR "DEB") set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) set(CPACK_COMPONENTS_ALL viam-cpp-sdk_dev) set(CPACK_PACKAGE_CONTACT "packaging@viam.com") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "libprotobuf32, libgrpc++1.51, libabsl20220623") -set(CPACK_PACKAGING_INSTALL_PREFIX "/usr") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "libprotobuf-dev, libgrpc++-dev") include(CPack) diff --git a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in index 005af602e..b3e77a6a3 100644 --- a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in +++ b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in @@ -1,6 +1,6 @@ -prefix=@CMAKE_INSTALL_PREFIX@ +prefix=@CPACK_PACKAGING_INSTALL_PREFIX@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/viam/sdk Name: @PROJECT_NAME@-libviamsdk Description: @PROJECT_DESCRIPTION@ From e36a88d3ecd8365329a33f04b5ff974919c72f6c Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Fri, 20 Oct 2023 17:02:50 -0400 Subject: [PATCH 05/14] remove Requires from pc.in -- it takes 56 seconds --- src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in | 1 - src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in | 1 - 2 files changed, 2 deletions(-) diff --git a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in index c547fc134..2192045db 100644 --- a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in +++ b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in @@ -7,7 +7,6 @@ Name: @PROJECT_NAME@-libapi Description: @PROJECT_DESCRIPTION@ URL: @PROJECT_HOMEPAGE_URL@ Version: @PROJECT_VERSION@ -Requires: grpc++ >= @VIAMCPPSDK_GRPCXX_VERSION@ protobuf >= @VIAMCPPSDK_PROTOBUF_VERSION@ Libs: -L${libdir} -L@Boost_LIBRARY_DIRS@ -lviamapi Cflags: -I${base_includedir} -I${deep_includedir} diff --git a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in index b3e77a6a3..285ad54ee 100644 --- a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in +++ b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in @@ -6,7 +6,6 @@ Name: @PROJECT_NAME@-libviamsdk Description: @PROJECT_DESCRIPTION@ URL: @PROJECT_HOMEPAGE_URL@ Version: @PROJECT_VERSION@ -Requires: grpc++ >= @VIAMCPPSDK_GRPCXX_VERSION@ protobuf >= @VIAMCPPSDK_PROTOBUF_VERSION@ @PROJECT_NAME@-libviamapi >= @PROJECT_VERSION@ Libs: -L${libdir} -L@Boost_LIBRARY_DIRS@ -lviamsdk -lviam_rust_utils Libs.private: -lboost_log-mt Cflags: -I${includedir} -I@Boost_INCLUDE_DIR@ From 82c5fb276c2d6e38c400010601641d04a640f39c Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Fri, 20 Oct 2023 17:27:38 -0400 Subject: [PATCH 06/14] use smaller runner to hopefully not get stuck in build queue --- .github/workflows/debian.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index b008f1055..0d71c7665 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -11,10 +11,10 @@ jobs: include: - container: debian:bookworm label: bookworm-aarch64 - runs-on: buildjet-8vcpu-ubuntu-2204-arm + runs-on: buildjet-4vcpu-ubuntu-2204-arm - container: debian:bookworm label: bookworm-x86_64 - runs-on: buildjet-8vcpu-ubuntu-2204 + runs-on: buildjet-4vcpu-ubuntu-2204 container: ${{ matrix.container }} runs-on: ${{ matrix.runs-on }} steps: From e7aa79388e150da626a707abe5195963f0328f80 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Fri, 20 Oct 2023 18:00:47 -0400 Subject: [PATCH 07/14] hardcode /usr prefix --- src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in | 2 +- src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in index 2192045db..f6869e41c 100644 --- a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in +++ b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in @@ -1,4 +1,4 @@ -prefix=@CPACK_PACKAGING_INSTALL_PREFIX@ +prefix=/usr libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ base_includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ deep_includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/viam/api diff --git a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in index 285ad54ee..a052da344 100644 --- a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in +++ b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in @@ -1,4 +1,4 @@ -prefix=@CPACK_PACKAGING_INSTALL_PREFIX@ +prefix=/usr libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/viam/sdk From 8f501a5d3d242bd6991e414548485eb759399602 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Mon, 23 Oct 2023 13:54:44 -0400 Subject: [PATCH 08/14] don't hardcode /usr prefix --- .github/workflows/debian.yml | 2 +- src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in | 2 +- src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 0d71c7665..b37e4e86d 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -45,7 +45,7 @@ jobs: run: mkdir build - name: cmake working-directory: ./build - run: cmake .. -G Ninja + run: cmake -DCMAKE_INSTALL_PREFIX=/usr .. -G Ninja - name: build working-directory: ./build run: ninja libviamsdk.so && cpack diff --git a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in index f6869e41c..098de26fb 100644 --- a/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in +++ b/src/viam/api/config/viam-cpp-sdk-libviamapi.pc.in @@ -1,4 +1,4 @@ -prefix=/usr +prefix=@CMAKE_INSTALL_PREFIX@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ base_includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ deep_includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/viam/api diff --git a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in index a052da344..01a3f7122 100644 --- a/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in +++ b/src/viam/sdk/config/viam-cpp-sdk-libviamsdk.pc.in @@ -1,4 +1,4 @@ -prefix=/usr +prefix=@CMAKE_INSTALL_PREFIX@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/viam/sdk From 60550da0b60c4d76088ef9c8e1477cd0e1baf308 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Mon, 23 Oct 2023 13:55:54 -0400 Subject: [PATCH 09/14] on dispatch instead of on push; this is manual for now, we are not releasing .deb packages yet --- .github/workflows/debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index b37e4e86d..c6f97f9b3 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -1,5 +1,5 @@ on: - push: + workflow_dispatch: env: CMAKE_VERSION: 3.27.4 From b6b1da2966bd3efab9a29bfa1f8b1cffe499d307 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Mon, 23 Oct 2023 13:58:34 -0400 Subject: [PATCH 10/14] todo to remove sed command --- .github/workflows/debian.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index c6f97f9b3..5c4af00eb 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -40,6 +40,7 @@ jobs: chmod +x cmake-${CMAKE_VERSION}-linux-$ARCH.sh ./cmake-${CMAKE_VERSION}-linux-$ARCH.sh --skip-license --prefix=/usr - name: remove examples + # todo(RSDK-4735): no longer needed once 'all' is cleaned up run: sed -i '/add_subdirectory.examples/d' src/viam/CMakeLists.txt - name: create build run: mkdir build From c6a3cf7a34f467e254e0d31a8e8fbbe7625f7ef8 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Mon, 23 Oct 2023 17:13:33 -0400 Subject: [PATCH 11/14] use cmake commands instead of ninja --- .github/workflows/debian.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 5c4af00eb..b672b3716 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -42,14 +42,12 @@ jobs: - name: remove examples # todo(RSDK-4735): no longer needed once 'all' is cleaned up run: sed -i '/add_subdirectory.examples/d' src/viam/CMakeLists.txt - - name: create build - run: mkdir build - name: cmake - working-directory: ./build - run: cmake -DCMAKE_INSTALL_PREFIX=/usr .. -G Ninja + run: cmake -S . -B ./build -G Ninja -DCMAKE_INSTALL_PREFIX=/usr - name: build - working-directory: ./build - run: ninja libviamsdk.so && cpack + run: | + cmake --build ./build --target libviamsdk.so + cpack -B ./build - uses: actions/upload-artifact@v3 with: name: debian-${{ matrix.label }} From 6c73a95247c3b4a1a9d12ae2092897a116576d5f Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Mon, 23 Oct 2023 17:13:43 -0400 Subject: [PATCH 12/14] temporarily restore `on: push` --- .github/workflows/debian.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index b672b3716..1ca109825 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -1,5 +1,6 @@ on: workflow_dispatch: + push: # DONOTMERGE env: CMAKE_VERSION: 3.27.4 From 70bacb11e3b5e118245499164d61de0c7c10535f Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Mon, 23 Oct 2023 17:20:48 -0400 Subject: [PATCH 13/14] cpack in build dir --- .github/workflows/debian.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 1ca109825..0e0b53c6a 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -46,9 +46,10 @@ jobs: - name: cmake run: cmake -S . -B ./build -G Ninja -DCMAKE_INSTALL_PREFIX=/usr - name: build + working-directory: build run: | - cmake --build ./build --target libviamsdk.so - cpack -B ./build + cmake --build . --target libviamsdk.so + cpack - uses: actions/upload-artifact@v3 with: name: debian-${{ matrix.label }} From 82b6883c531b50a3ff2cb60b888dfb932bda8bb7 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Mon, 23 Oct 2023 18:12:34 -0400 Subject: [PATCH 14/14] add boost-log dep --- src/viam/sdk/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viam/sdk/CMakeLists.txt b/src/viam/sdk/CMakeLists.txt index 08121d876..6f0e1ac25 100644 --- a/src/viam/sdk/CMakeLists.txt +++ b/src/viam/sdk/CMakeLists.txt @@ -254,5 +254,5 @@ set(CPACK_GENERATOR "DEB") set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) set(CPACK_COMPONENTS_ALL viam-cpp-sdk_dev) set(CPACK_PACKAGE_CONTACT "packaging@viam.com") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "libprotobuf-dev, libgrpc++-dev") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "libprotobuf-dev, libgrpc++-dev, libboost-log-dev") include(CPack)