From 002d97351b1ac37eeec17cce38e5d2f95fc27de5 Mon Sep 17 00:00:00 2001
From: Stefan Bienert <stefan.bienert@unibas.ch>
Date: Fri, 14 Feb 2020 14:05:46 +0100
Subject: [PATCH] Adapt new C/ CXX_FLAGS into the CI YAML file
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 755fed9fc..0fafefeb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,8 +71,8 @@ test:centos7.3:
-DZLIB_INCLUDE_DIR=$EBROOTZLIB/include
-DZLIB_LIBRARY=$EBROOTZLIB/lib/libz.so
-DOPTIMIZE=1
- -DCMAKE_C_FLAGS='-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='-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_C_FLAGS='-L${EBROOTLIBPNG}/lib/ -L${EBROOTLIBTIFF}/lib/ -L${EBROOTZLIB}/lib/ -isystem ${EBROOTBOOST}/include -isystem ${EBROOTOPENMM}/include'
+ -DCMAKE_CXX_FLAGS='-L${EBROOTLIBPNG}/lib/ -L${EBROOTLIBTIFF}/lib/ -L${EBROOTZLIB}/lib/ -isystem ${EBROOTBOOST}/include -isystem ${EBROOTOPENMM}/include'
-DCMAKE_EXE_LINKER_FLAGS=" -pthread"
- make -j 2
- echo " ... done building OST."
--
GitLab