Commit 6d7c0badc1290e419ab03707373b2bb5b8d0c82e

Authored by Jay Berkenbilt
Committed by Jay Berkenbilt
1 parent 702058a1

Convert build-linux to cmake

Showing 1 changed file with 12 additions and 8 deletions
build-scripts/build-linux
@@ -2,16 +2,20 @@ @@ -2,16 +2,20 @@
2 set -ex 2 set -ex
3 sudo apt-get update 3 sudo apt-get update
4 sudo apt-get -y install \ 4 sudo apt-get -y install \
5 - autoconf build-essential zlib1g-dev libjpeg-dev libgnutls28-dev \ 5 + build-essential cmake zlib1g-dev libjpeg-dev libgnutls28-dev \
6 libssl-dev libtiff-tools ghostscript 6 libssl-dev libtiff-tools ghostscript
7 -./configure --enable-werror \  
8 - --enable-crypto-native --enable-crypto-openssl --enable-crypto-gnutls \  
9 - --enable-show-failed-test-output --enable-test-compare-images  
10 -make -j$(nproc) -k  
11 -for i in $(./qpdf/build/qpdf --show-crypto); do  
12 - echo "*** Running tests with crypto provider $i"  
13 - env QPDF_CRYPTO_PROVIDER=$i make -k check 7 +cmake -S . -B build -DCI_MODE=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  8 + -DREQUIRE_CRYPTO_OPENSSL=1 -DREQUIRE_CRYPTO_GNUTLS=1
  9 +cmake --build build -j$(nproc) -- -k
  10 +cd build
  11 +# libtests automatically runs with all crypto providers.
  12 +env QPDF_TEST_COMPARE_IMAGES=1 ctest --verbose
  13 +# Run just qpdf tests with remaining crypto providers.
  14 +for i in $(./qpdf/qpdf --show-crypto | tail -n +2); do
  15 + echo "*** Running qpdf tests with crypto provider $i"
  16 + env QPDF_CRYPTO_PROVIDER=$i ctest --verbose -R '^qpdf$'
14 done 17 done
  18 +cd ..
15 export TMPDIR=$PWD/dist-tmp 19 export TMPDIR=$PWD/dist-tmp
16 rm -rf $TMPDIR 20 rm -rf $TMPDIR
17 ./make_dist --ci 21 ./make_dist --ci