Commit 6bff03c6 authored by Jan Kiene's avatar Jan Kiene
Browse files

add -Werror activation for Unix builds (make and cmake)

parent 5c6931f1

.gitlab-ci.yml

+9 −0
Original line number Diff line number Diff line
@@ -172,6 +172,9 @@ stages: 
    - cp "$LTV_DIR"/*.met scripts/testv/

    - cp "$LTV_DIR"/*.csv scripts/testv/



.activate-Werror: &activate-Werror

  - sed -i ".bak" "s/^# \(CFLAGS += -Werror\)/\1/" Makefile

  - sed -i ".bak" "s/# \(set(CMAKE_C_FLAGS \"\${CMAKE_C_FLAGS} -Werror\")\)/\1/" CMakeLists.txt



# ---------------------------------------------------------------

# Job templates
@@ -313,6 +316,7 @@ build-codec-linux-make: 
    - .rules-basis

  script:

    - *print-common-info

    - *activate-Werror

    - make -j



build-codec-linux-cmake:
@@ -321,6 +325,7 @@ build-codec-linux-cmake: 
    - .rules-basis

  script:

    - *print-common-info

    - *activate-Werror

    - mkdir build

    - cd build

    - cmake ..
@@ -334,6 +339,7 @@ build-codec-instrumented-linux: 
  timeout: "6 minutes"

  script:

    - *print-common-info

    - *activate-Werror

    - bash ci/build_codec_instrumented_linux.sh



# make sure that the codec builds with msan, asan and usan
@@ -343,6 +349,7 @@ build-codec-sanitizers-linux: 
    - .rules-basis

  script:

    - *print-common-info

    - *activate-Werror

    - bash ci/build_codec_sanitizers_linux.sh



build-codec-include-split-linux-make:
@@ -352,6 +359,7 @@ build-codec-include-split-linux-make: 
  script:

    - *print-common-info

    - *enable-split-rendering

    - *activate-Werror

    - make -j INCLUDE_SPLIT=1



build-codec-include-split-linux-cmake:
@@ -361,6 +369,7 @@ build-codec-include-split-linux-cmake: 
  script:

    - *print-common-info

    - *enable-split-rendering

    - *activate-Werror

    - mkdir build

    - cd build

    - cmake .. -DINCLUDE_SPLIT=1

CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ if(UNIX) 
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffp-contract=off")  # disable floating point operation contraction

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wno-unused-parameter")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")

  # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")

  # CLANG

  if(CLANG)

    find_program(clangBin NAMES /home/amm-archiv/soft/Linux/clang/current/bin/clang clang REQUIRED)

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -57,8 +57,9 @@ endif 
# C compiler flags

CFLAGS   += -std=c99 -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long     \

            -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes  \

            -Werror \

            -Wno-implicit-fallthrough -ffp-contract=off

# to be uncommented in CI

# CFLAGS += -Werror



# libs to link

LDLIBS   += -lm