From 23342853809dbbe1b52cf53e5e7c7d701da5df93 Mon Sep 17 00:00:00 2001
From: Stefan Bienert <stefan.bienert@unibas.ch>
Date: Fri, 7 Feb 2020 11:38:40 +0100
Subject: [PATCH] SCHWED-4612: Update CMake call for CI.
---
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bf2dd628..362e73431 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,9 +68,11 @@ test:centos7.3:
-DZLIB_INCLUDE_DIR=$EBROOTZLIB/include
-DTIFF_INCLUDE_DIR=$EBROOTLIBTIFF/include
-DTIFF_LIBRARY=$EBROOTLIBTIFF/lib/libtiff.so
+ -DZLIB_INCLUDE_DIR=$EBROOTZLIB/include
+ -DZLIB_LIBRARY=$EBROOTZLIB/lib/libz.so
-DOPTIMIZE=1
- -DCMAKE_C_FLAGS='-Wno-unused-local-typedefs -L/scicore/soft/apps/libpng/1.6.34-GCCcore-7.3.0/lib/ -L/scicore/soft/apps/LibTIFF/4.0.9-GCCcore-7.3.0/lib/ -L/scicore/soft/apps/zlib/1.2.11-GCCcore-7.3.0/lib'
- -DCMAKE_CXX_FLAGS='-Wno-unused-local-typedefs -L/scicore/soft/apps/libpng/1.6.34-GCCcore-7.3.0/lib/ -L/scicore/soft/apps/LibTIFF/4.0.9-GCCcore-7.3.0/lib/ -L/scicore/soft/apps/zlib/1.2.11-GCCcore-7.3.0/lib'
+ -DCMAKE_C_FLAGS='-Wno-unused-local-typedefs -L/scicore/soft/apps/libpng/1.6.34-GCCcore-7.3.0/lib/ -L/scicore/soft/apps/LibTIFF/4.0.9-GCCcore-7.3.0/lib/ -L/scicore/soft/apps/zlib/1.2.11-GCCcore-7.3.0/lib/ -isystem ${EBROOTBOOST}/include -isystem ${EBROOTOPENMM}/include'
+ -DCMAKE_CXX_FLAGS='-Wno-unused-local-typedefs -L/scicore/soft/apps/libpng/1.6.34-GCCcore-7.3.0/lib/ -L/scicore/soft/apps/LibTIFF/4.0.9-GCCcore-7.3.0/lib/ -L/scicore/soft/apps/zlib/1.2.11-GCCcore-7.3.0/lib/ -isystem ${EBROOTBOOST}/include -isystem ${EBROOTOPENMM}/include'
-DCMAKE_EXE_LINKER_FLAGS=" -pthread"
- make -j 2
- echo " ... done building OST."
--
GitLab