diff options
| author | Sergei Nikulov <snikulov@users.noreply.github.com> | 2018-03-22 16:34:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 16:34:49 +0300 |
| commit | 66e93802e6885f4f9e64ca7a3a2d7ff96338ef8c (patch) | |
| tree | fd5531d166c4b182d4c00c2b72eb1cebb826306b | |
| parent | 6231a89aa3961e357d7eb717548463985de2d08d (diff) | |
| download | curl-66e93802e6885f4f9e64ca7a3a2d7ff96338ef8c.tar.gz | |
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
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3232e9a49..f44968b94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) |