From 85c08fa368609ad6dc6d91817ab8ca3da9503f79 Mon Sep 17 00:00:00 2001 From: fmckenna Date: Mon, 23 Oct 2023 22:28:14 -0700 Subject: [PATCH] fmk - updating PBE.pro for quzip linux --- Dockerfile | 8 +++++--- PBE.pro | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6a3e0c..1e937c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ FROM ubuntu:bionic SHELL ["/bin/bash", "-c"] ARG versionPBE=d3.2.0 +ARG versionEE=d3.4.0 ARG versionSimCenterCommon=v23.09 ARG versionSimCenterBackend=v23.09 ARG versionOpenSees=v3.5.0 @@ -34,16 +35,17 @@ RUN apt-get update \ # RUN source /opt/qt515/bin/qt515-env.sh \ - && sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget \ + && sudo apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget \ && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add - \ && sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' \ && sudo apt-get install -y cmake zlib1g-dev \ && git clone -b v1.4 --single-branch https://github.com/stachenov/quazip.git \ && cd quazip \ && mkdir build; cd build; cmake ..; make; make install \ - & cd ..\.. \ + & cd ../.. \ && git clone -b $versionSimCenterCommon --single-branch https://github.com/NHERI-SimCenter/SimCenterCommon.git \ - && git clone https://github.com/NHERI-SimCenter/QS3hark.git \ + && git clone https://github.com/NHERI-SimCenter/QS3hark.git \ + && git clone -b $versionEE --single-branch https://github.com/NHERI-SimCenter/EE-UQ.git \ && git clone -b $versionPBE --single-branch https://github.com/NHERI-SimCenter/PBE.git \ && cd PBE \ && mkdir build \ diff --git a/PBE.pro b/PBE.pro index accddf1..42d4adc 100644 --- a/PBE.pro +++ b/PBE.pro @@ -43,7 +43,7 @@ win32{ QMAKE_INFO_PLIST=$$PWD/Info.plist LIBS += $$PWD/../quazip/build/quazip/libquazip1-qt5.1.4.dylib } else { - LIBS += -lc + LIBS += -L/usr/local/lib -lquazip1-qt5 -lc } }