Unverified Commit 54aef857 authored by Marcel Raad's avatar Marcel Raad
Browse files

CMake: fix CURL_WERROR for MSVC 

When using CURL_WERROR in MSVC builds, the debug flags were overridden
by the release flags and /WX got added twice in debug mode.

Closes https://github.com/curl/curl/pull/1715
parent 26e02eae

CMakeLists.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -246,7 +246,7 @@ endif(BORLAND) 
if(CURL_WERROR)

if(CURL_WERROR)

  if(MSVC_VERSION)

  if(MSVC_VERSION)

    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX")

    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX")

    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_RELEASE} /WX")

    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX")

  else()

  else()

    # this assumes clang or gcc style options

    # this assumes clang or gcc style options

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

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