diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48628be59bfaee14c72887fc34e468494e1cffe5..7bf2dd6282198e4ebdfa07e4a3e77dc8b8616676 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,10 +18,8 @@ test:centos7.3: - yum -y -q -e 0 install make - yum -y -q -e 0 install libicu - yum -y -q -e 0 install libjpeg-turbo - - yum -y -q -e 0 install mesa-libGL-devel - - yum -y -q -e 0 install mesa-libGLU-devel - yum -y -q -e 0 install freetype - - yum -y -q -e 0 install libpng + - yum -y -q -e 0 install openssl - mkdir -p /scicore/soft/modules - ln -s /export/soft/apps/centos7/generic /scicore/soft/apps - ln -s /export/soft/modules/centos7/generic/all /scicore/soft/modules @@ -33,7 +31,9 @@ test:centos7.3: - module load Eigen/3.3.1 - module load Boost/1.68.0-foss-2018b-Python-3.6.6 - module load LibTIFF/.4.0.9-GCCcore-7.3.0 + - module load libpng/.1.6.34-GCCcore-7.3.0 - module load HH-suite/2.0.16-foss-2018b + - module load Perl/5.28.0-GCCcore-7.3.0 - module load OpenMM/7.1.1-foss-2018b-Python-3.6.6 - module load SQLite/3.24.0-GCCcore-7.3.0 - module load dssp/2.2.1-foss-2018b-Boost-1.68.0-Python-3.6.6 @@ -63,7 +63,7 @@ test:centos7.3: -DSQLITE3_INCLUDE_DIR=$EBROOTSQLITE/include -DBOOST_ROOT=$EBROOTBOOST -DPNG_LIBRARY=$EBROOTLIBPNG/lib/libpng.so - -DPNG_INCLUDE_DIR=$EBROOTLIBPNG/include + -DPNG_PNG_INCLUDE_DIR=$EBROOTLIBPNG/include -DZLIB_LIBRARY=$EBROOTZLIB/lib/libz.so -DZLIB_INCLUDE_DIR=$EBROOTZLIB/include -DTIFF_INCLUDE_DIR=$EBROOTLIBTIFF/include