From 25f59b51a9b75ae25a62f942e866b3c3958094e9 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Tue, 6 Oct 2020 18:38:34 +0200 Subject: [PATCH] Add install of RPM package from Centos and Fedora CMake builds --- ci/install-packages.sh | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/ci/install-packages.sh b/ci/install-packages.sh index 18db70e56..8ef13ae97 100755 --- a/ci/install-packages.sh +++ b/ci/install-packages.sh @@ -24,15 +24,19 @@ if [ "${ID_LIKE}" = "debian" ]; then apt install ./${DIR}/os/${ARCH}/graphviz_${GV_VERSION}-1_amd64.deb fi else - rpm --install --force \ - ${DIR}/os/${ARCH}/graphviz-${GV_VERSION}*.rpm \ - ${DIR}/os/${ARCH}/graphviz-libs-${GV_VERSION}*.rpm \ - ${DIR}/os/${ARCH}/graphviz-devel-${GV_VERSION}*.rpm \ - ${DIR}/os/${ARCH}/graphviz-plugins-core-${GV_VERSION}*.rpm \ - ${DIR}/os/${ARCH}/graphviz-plugins-x-${GV_VERSION}*.rpm \ - ${DIR}/os/${ARCH}/graphviz-x-${GV_VERSION}*.rpm \ - ${DIR}/os/${ARCH}/graphviz-gd-${GV_VERSION}*.rpm \ - ${DIR}/os/${ARCH}/graphviz-qt-${GV_VERSION}*.rpm \ - ${DIR}/os/${ARCH}/graphviz-plugins-gd-${GV_VERSION}*.rpm \ - ${DIR}/os/${ARCH}/graphviz-nox-${GV_VERSION}*.rpm + if [ "${build_system}" = "cmake" ]; then + rpm --install --force ${DIR}/os/${ARCH}/Graphviz-${GV_VERSION}-Linux.rpm + else + rpm --install --force \ + ${DIR}/os/${ARCH}/graphviz-${GV_VERSION}*.rpm \ + ${DIR}/os/${ARCH}/graphviz-libs-${GV_VERSION}*.rpm \ + ${DIR}/os/${ARCH}/graphviz-devel-${GV_VERSION}*.rpm \ + ${DIR}/os/${ARCH}/graphviz-plugins-core-${GV_VERSION}*.rpm \ + ${DIR}/os/${ARCH}/graphviz-plugins-x-${GV_VERSION}*.rpm \ + ${DIR}/os/${ARCH}/graphviz-x-${GV_VERSION}*.rpm \ + ${DIR}/os/${ARCH}/graphviz-gd-${GV_VERSION}*.rpm \ + ${DIR}/os/${ARCH}/graphviz-qt-${GV_VERSION}*.rpm \ + ${DIR}/os/${ARCH}/graphviz-plugins-gd-${GV_VERSION}*.rpm \ + ${DIR}/os/${ARCH}/graphviz-nox-${GV_VERSION}*.rpm + fi fi -- 2.50.1