Unverified Commit 66e93802 authored by Sergei Nikulov's avatar Sergei Nikulov Committed by GitHub
Browse files

cmake: avoid warn-as-error during config checks (#2411) 

- Move the CURL_WERROR option processing after the configuration checks
  to avoid failures in case of warnings during the configuration checks.

This is a partial fix for #2358
parent 6231a89a

CMakeLists.txt

+10 −11
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -232,16 +232,6 @@ if(BORLAND) 
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-")

endif(BORLAND)



if(CURL_WERROR)

  if(MSVC_VERSION)

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

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

  else()

    # this assumes clang or gcc style options

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

  endif()

endif(CURL_WERROR)



# If we are on AIX, do the _ALL_SOURCE magic

if(${CMAKE_SYSTEM_NAME} MATCHES AIX)

  set(_ALL_SOURCE 1)
@@ -1127,6 +1117,15 @@ if(MSVC) 
  endif(CMAKE_C_FLAGS MATCHES "/W[0-4]")

endif(MSVC)



if(CURL_WERROR)

  if(MSVC_VERSION)

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

  else()

    # this assumes clang or gcc style options

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

  endif()

endif(CURL_WERROR)



# Ugly (but functional) way to include "Makefile.inc" by transforming it (= regenerate it).

function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)

  file(READ ${INPUT_FILE} MAKEFILE_INC_TEXT)