From c3847ff38a181e8f28ddd0d0a4a9205f8fb2da6c Mon Sep 17 00:00:00 2001 From: Christophe Prud'homme Date: Wed, 10 Feb 2021 07:04:43 +0000 Subject: [PATCH] add runtime depends --- Dockerfile | 6 ++++-- cmake/CMakeLists.txt | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e47b919e90..723158e8dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,10 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu focal-proposed main restricted" | echo "deb http://archive.ubuntu.com/ubuntu focal-proposed multiverse" | tee -a /etc/apt/sources.list; \ apt-get -qq update; \ apt-get -y install tzdata dos2unix rsync; \ - apt-get -y install libxml2 liboce-foundation11 liboce-modeling11 liboce-ocaf11 liboce-visualization11 liboce-ocaf-lite11; \ - rm -rf /var/lib/apt/lists/* ; + apt-get -y install python3 libxml2 liboce-foundation11 liboce-modeling11 liboce-ocaf11 liboce-visualization11 \ + liboce-ocaf-lite11 libpython3.8 libboost-system1.67.0 libboost-program-options1.67.0 \ + libboost-regex1.67.0 libboost-thread1.67.0 libboost-date-time1.67.0; \ + rm -rf /var/lib/apt/lists/* ; COPY . /home/feelpp/ RUN ls -lrtR /home/feelpp diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 48674f1824..1c10b4c6fa 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -742,15 +742,15 @@ set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}") set(CPACK_GENERATOR "TGZ;DEB") set(CPACK_SOURCE_GENERATOR "TGZ") -message(STATUS "boost ${BOOST_COMPONENTS}") + FOREACH(COMPONENT IN ITEMS ${BOOST_COMPONENTS}) string(REPLACE "_" "-" COMP ${COMPONENT}) set(BOOST_DEPS "${BOOST_DEPS}, libboost-${COMP}1.67.0") endforeach(COMPONENT) -message(STATUS "deps ${BOOST_DEPS}") + set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_CONTACT}") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "libxml2, liboce-foundation11, liboce-modeling11, liboce-ocaf11, liboce-visualization11, liboce-ocaf-lite11, libpython3.8 ${BOOST_DEPS}") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libxml2, liboce-foundation11, liboce-modeling11, liboce-ocaf11, liboce-visualization11, liboce-ocaf-lite11, libpython3.8 ${BOOST_DEPS}") set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}") set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}") set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")