From 8593548d0ce62a429c9ed9a33c16393ea00e1661 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Mon, 15 Feb 2016 20:02:47 +0100 Subject: [PATCH] Add opts files for gcc and clang This is easier than setting CMAKE_FLAGS directly in .gitlab-ci.yml and allows to change options in a central place (or two places). --- base-8/Dockerfile | 1 + base-8/opts.clang | 1 + base-8/opts.gcc | 1 + base-9/Dockerfile | 1 + base-9/opts.clang | 1 + base-9/opts.gcc | 1 + 6 files changed, 6 insertions(+) create mode 100644 base-8/opts.clang create mode 100644 base-8/opts.gcc create mode 100644 base-9/opts.clang create mode 100644 base-9/opts.gcc diff --git a/base-8/Dockerfile b/base-8/Dockerfile index ed43c13..69fb5e0 100644 --- a/base-8/Dockerfile +++ b/base-8/Dockerfile @@ -30,3 +30,4 @@ RUN apt-get update && apt-get dist-upgrade --no-install-recommends --yes \ RUN adduser --disabled-password --home /duneci duneci USER duneci WORKDIR /duneci +COPY opts.clang opts.gcc /duneci diff --git a/base-8/opts.clang b/base-8/opts.clang new file mode 100644 index 0000000..38aca04 --- /dev/null +++ b/base-8/opts.clang @@ -0,0 +1 @@ +CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_CXX_FLAGS='-O2 -g -Wall'" diff --git a/base-8/opts.gcc b/base-8/opts.gcc new file mode 100644 index 0000000..90868a5 --- /dev/null +++ b/base-8/opts.gcc @@ -0,0 +1 @@ +CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall'" diff --git a/base-9/Dockerfile b/base-9/Dockerfile index 729e110..519f671 100644 --- a/base-9/Dockerfile +++ b/base-9/Dockerfile @@ -30,3 +30,4 @@ RUN apt-get update && apt-get dist-upgrade --no-install-recommends --yes \ RUN adduser --disabled-password --home /duneci duneci USER duneci WORKDIR /duneci +COPY opts.clang opts.gcc /duneci diff --git a/base-9/opts.clang b/base-9/opts.clang new file mode 100644 index 0000000..38aca04 --- /dev/null +++ b/base-9/opts.clang @@ -0,0 +1 @@ +CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_CXX_FLAGS='-O2 -g -Wall'" diff --git a/base-9/opts.gcc b/base-9/opts.gcc new file mode 100644 index 0000000..90868a5 --- /dev/null +++ b/base-9/opts.gcc @@ -0,0 +1 @@ +CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall'" -- GitLab