From 71f13e9a966af577de33adcf171204196187d01d Mon Sep 17 00:00:00 2001
From: Alejandro Lopez Gestoso <alopez@iri.upc.edu>
Date: Thu, 16 May 2019 14:59:52 +0200
Subject: [PATCH] Added libboost-all-dev cpack dependency
---
.gitlab-ci.yml | 2 +-
CMakeLists.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d9d80f..3e48011 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ build-package:
# - apt-get -y --allow-unauthenticated install iri-<package_name>-dev
- apt-get update
- apt-get -y --allow-unauthenticated install iri-iriutils-dev iri-comm-dev
- - apt-get install -y libxerces-c-dev xsdcxx
+ - apt-get install -y libxerces-c-dev xsdcxx libboost-all-dev
- mkdir -pv build
- cd build
- cmake -D CMAKE_BUILD_TYPE=RELEASE -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e327b3..6617abb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ ELSE ()
ENDIF()
IF (UNIX)
- SET(CPACK_PACKAGE_FILE_NAME "iri-${PACKAGE_NAME}-dev-${CPACK_PACKAGE_VERSION}${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ SET(CPACK_PACKAGE_FILE_NAME "iri-${PACKAGE_NAME}-dev-${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
SET(CPACK_PACKAGE_NAME "iri-${PACKAGE_NAME}-dev")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Part of IRI-laboratory libraries. More information at http://wiki.iri.upc.edu/index.php/LabRobotica")
SET(CPACK_PACKAGING_INSTALL_PREFIX /usr)
@@ -93,7 +93,7 @@ IF (UNIX)
# Uncomment to add dependencies comma separated
# SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-<package_name>-dev (>= 1.0~${DISTRIB})")
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-iriutils-dev (>= 1.0~${DISTRIB}), iri-comm-dev (>= 1.0~${DISTRIB}), libxerces-c-dev (>= 1.0~${DISTRIB}), xsdcxx (>= 1.0~${DISTRIB})")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-iriutils-dev (>= 1.0~${DISTRIB}), iri-comm-dev (>= 1.0~${DISTRIB}), libxerces-c-dev (>= 1.0~${DISTRIB}), xsdcxx (>= 1.0~${DISTRIB}), libboost-all-dev (>= 1.0~${DISTRIB})")
INCLUDE(CPack)
ELSE(UNIX)
--
GitLab