Skip to content

Commit 774f8bb

Browse files
committed
Fix CPack packaging paths
Fixes: #112
1 parent 8d96349 commit 774f8bb

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.ci/Dockerfile.ubuntu_deb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ FROM qtprotobuf/ubuntu-latest-builtin-qt:latest
22
ADD . /sources
33
RUN mkdir -p /build && mkdir -p /artifacts
44
WORKDIR /build
5-
RUN cmake ../sources -DQT_PROTOBUF_MAKE_TESTS=FALSE -DQT_PROTOBUF_MAKE_EXAMPLES=FALSE -DCMAKE_BUILD_TYPE=Release
6-
RUN cpack -G DEB ..
5+
RUN cmake ../sources -DQT_PROTOBUF_MAKE_TESTS=FALSE -DQT_PROTOBUF_MAKE_EXAMPLES=FALSE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
6+
RUN cpack -G DEB

cmake/packaging.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
set(CPACK_PACKAGE_CONTACT "Alexey Edelev <semlanik@gmail.com>")
22
set(CPACK_PACKAGE_DESCRIPTION "gRPC and Protobuf generator and bindings for Qt framework")
33
set(CPACK_PACKAGE_NAME "qtprotobuf")
4+
set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
45

56
include("${QT_PROTOBUF_CMAKE_DIR}/deb.cmake")
67
include("${QT_PROTOBUF_CMAKE_DIR}/rpm.cmake")

0 commit comments

Comments
 (0)