Skip to content
Snippets Groups Projects
Commit c85676ba authored by Andreas Dedner's avatar Andreas Dedner Committed by Robert K
Browse files

[bugfix][CI] corrected CMAKE flags variable.

parent a4e5907e
No related branches found
No related tags found
1 merge request!8Feature/python tests
Pipeline #25522 passed
......@@ -2,8 +2,9 @@
variables:
DUNECI_OPTS: $CI_PROJECT_DIR/scripts/opts/ci-gcc.opts
# dune-python will use DUNE_OPTS when building stuff
DUNE_OPTS: $CI_PROJECT_DIR/scripts/opts/ci-gcc.opts
DUNE_CMAKE_FLAGS: -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE -DCMAKE_CXX_FLAGS='-O3 -g -Wall -fdiagnostics-color=always'
# doen't seem to be true anymore - uses DUNE_CMAKE_FLAGS instead
# DUNE_OPTS: $CI_PROJECT_DIR/opts.gcc
DUNECI_CMAKE_FLAGS: "-DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
DUNECI_TOOLCHAIN: gcc-7-17
DUNE_CONTROL_PATH: /duneci/modules:$CI_PROJECT_DIR
DUNE_PY_DIR: /duneci/modules/dune-py
......@@ -24,15 +25,19 @@ before_script:
- duneci-install-module https://gitlab.dune-project.org/dune-fem/dune-fem.git
# debian:10 gcc:c++17:
debian-10-gcc-8-17:
image: duneci/debian:10
#debian-10-gcc-8-17:
#image: duneci/debian:10
# script:
# - source /duneci/modules/dune-pip/bin/activate
# issue with setup-dunepy: dune-fem-dg not yet build so dependency in dune-fem-dg fails
# - python /duneci/modules/dune-python/bin/setup-dunepy.py --opts=$CI_PROJECT_DIR/scripts/opts/ci-gcc.opts install
# - duneci-standard-test
ubuntu:18.04--gcc:
image: duneci/ubuntu:18.04
script:
- source /duneci/modules/dune-pip/bin/activate
# issue with setup-dunepy: dune-fem-dg not yet build so dependency in dune-fem-dg fails
# - python /duneci/modules/dune-python/bin/setup-dunepy.py --opts=$CI_PROJECT_DIR/scripts/opts/ci-gcc.opts install
- duneci-standard-test
#ubuntu:18.04--gcc:
# image: duneci/ubuntu:18.04
# script: duneci-standard-test
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment