Commit e0ad34a3 authored by Jan Kiene's avatar Jan Kiene
Browse files

patch WX in windows cmake build

parent 6bff03c6

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ stages: 
.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

  - sed -i ".bak" "s/# \(add_compile_options(\"\/WX\")\)/\1/" CMakeLists.txt



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

# Job templates

CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -61,7 +61,9 @@ if(UNIX) 
  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} -Wno-unused-parameter")

  # to be uncommented in CI

  # 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)
@@ -114,7 +116,9 @@ elseif(WIN32) 
    /MP

  )

  if(NOT INCLUDE_SPLIT)

    add_compile_options("/W4" "/WX")

    add_compile_options("/W4")

    # to be uncommented in CI

    # add_compile_options("/WX")

  endif()

endif()