diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-10 21:38:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 21:38:24 +0000 |
| commit | 99afd41f1c43c856d39e3b9572d7a2103875a771 (patch) | |
| tree | 1a8e2aef8042d2e209dbb0d8bc92438585b0ca95 | |
| parent | 3afa1ede0220c11c95471d662b1572812059cc9d (diff) | |
| parent | 6af6170b684d9ba29d01d1075d22c5530664a6d5 (diff) | |
| download | libgit2-99afd41f1c43c856d39e3b9572d7a2103875a771.tar.gz | |
Merge pull request #4924 from lhchavez/werror
Make ENABLE_WERROR actually work
| -rw-r--r-- | cmake/Modules/AddCFlagIfSupported.cmake | 6 | ||||
| -rw-r--r-- | cmake/Modules/EnableWarnings.cmake | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/cmake/Modules/AddCFlagIfSupported.cmake b/cmake/Modules/AddCFlagIfSupported.cmake index 1d6181cac..b7aaa7910 100644 --- a/cmake/Modules/AddCFlagIfSupported.cmake +++ b/cmake/Modules/AddCFlagIfSupported.cmake @@ -7,7 +7,8 @@ INCLUDE(CheckCCompilerFlag) MACRO(ADD_C_FLAG _FLAG) STRING(TOUPPER ${_FLAG} UPCASE) - STRING(REGEX REPLACE "^-" "" UPCASE_PRETTY ${UPCASE}) + STRING(REGEX REPLACE "[-=]" "_" UPCASE_PRETTY ${UPCASE}) + STRING(REGEX REPLACE "^_+" "" UPCASE_PRETTY ${UPCASE_PRETTY}) CHECK_C_COMPILER_FLAG(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED) IF(IS_${UPCASE_PRETTY}_SUPPORTED) @@ -19,7 +20,8 @@ ENDMACRO() MACRO(ADD_C_FLAG_IF_SUPPORTED _FLAG) STRING(TOUPPER ${_FLAG} UPCASE) - STRING(REGEX REPLACE "^-" "" UPCASE_PRETTY ${UPCASE}) + STRING(REGEX REPLACE "[-=]" "_" UPCASE_PRETTY ${UPCASE}) + STRING(REGEX REPLACE "^_+" "" UPCASE_PRETTY ${UPCASE_PRETTY}) CHECK_C_COMPILER_FLAG(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED) IF(IS_${UPCASE_PRETTY}_SUPPORTED) diff --git a/cmake/Modules/EnableWarnings.cmake b/cmake/Modules/EnableWarnings.cmake index e7d7d3986..72e1523c4 100644 --- a/cmake/Modules/EnableWarnings.cmake +++ b/cmake/Modules/EnableWarnings.cmake @@ -1,14 +1,11 @@ MACRO(ENABLE_WARNINGS flag) - IF(ENABLE_WERROR) - ADD_C_FLAG_IF_SUPPORTED(-Werror=${flag}) - ELSE() - ADD_C_FLAG_IF_SUPPORTED(-W${flag}) - ENDIF() + ADD_C_FLAG_IF_SUPPORTED(-W${flag}) ENDMACRO() MACRO(DISABLE_WARNINGS flag) ADD_C_FLAG_IF_SUPPORTED(-Wno-${flag}) - IF(ENABLE_WERROR) - ADD_C_FLAG_IF_SUPPORTED(-Wno-error=${flag}) - ENDIF() ENDMACRO() + +IF(ENABLE_WERROR) + ADD_C_FLAG_IF_SUPPORTED(-Werror) +ENDIF() |