Browse Source

Fix CPack packaging paths

Fixes: #112
Alexey Edelev 4 years ago
parent
commit
74121165fa
3 changed files with 5 additions and 4 deletions
  1. 2 2
      .ci/Dockerfile.opensuse_rpm
  2. 2 2
      .ci/Dockerfile.ubuntu_deb
  3. 1 0
      cmake/packaging.cmake

+ 2 - 2
.ci/Dockerfile.opensuse_rpm

@@ -2,5 +2,5 @@ FROM qtprotobuf/opensuse-latest-builtin-qt:latest
 ADD . /sources
 RUN mkdir -p /build && mkdir -p /artifacts
 WORKDIR /build
-RUN PATH=$PATH:/usr/lib64/qt5/bin cmake ../sources -DQT_PROTOBUF_MAKE_TESTS=FALSE -DQT_PROTOBUF_MAKE_EXAMPLES=FALSE -DCMAKE_BUILD_TYPE=Release
-RUN cpack -G RPM ..
+RUN PATH=$PATH:/usr/lib64/qt5/bin cmake ../sources -DQT_PROTOBUF_MAKE_TESTS=FALSE -DQT_PROTOBUF_MAKE_EXAMPLES=FALSE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+RUN cpack -G RPM

+ 2 - 2
.ci/Dockerfile.ubuntu_deb

@@ -2,5 +2,5 @@ FROM qtprotobuf/ubuntu-latest-builtin-qt:latest
 ADD . /sources
 RUN mkdir -p /build && mkdir -p /artifacts
 WORKDIR /build
-RUN cmake ../sources -DQT_PROTOBUF_MAKE_TESTS=FALSE -DQT_PROTOBUF_MAKE_EXAMPLES=FALSE -DCMAKE_BUILD_TYPE=Release
-RUN cpack -G DEB ..
+RUN cmake ../sources -DQT_PROTOBUF_MAKE_TESTS=FALSE -DQT_PROTOBUF_MAKE_EXAMPLES=FALSE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+RUN cpack -G DEB

+ 1 - 0
cmake/packaging.cmake

@@ -1,6 +1,7 @@
 set(CPACK_PACKAGE_CONTACT "Alexey Edelev <semlanik@gmail.com>")
 set(CPACK_PACKAGE_DESCRIPTION "gRPC and Protobuf generator and bindings for Qt framework")
 set(CPACK_PACKAGE_NAME "qtprotobuf")
+set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 
 include("${QT_PROTOBUF_CMAKE_DIR}/deb.cmake")
 include("${QT_PROTOBUF_CMAKE_DIR}/rpm.cmake")