diff options
| author | Patrick Steinhardt <ps@pks.im> | 2020-04-03 22:53:23 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2020-06-01 14:06:20 +0200 |
| commit | 511fb9e6f8e3aaeefd0cd7573e03ce5727ac6dca (patch) | |
| tree | 1e8ee95ba32a39571b286b8a4954dd7ab94342b9 | |
| parent | 3956679c13a5005db128c52ce56eb1b4ced4df82 (diff) | |
| download | libgit2-511fb9e6f8e3aaeefd0cd7573e03ce5727ac6dca.tar.gz | |
cmake: always disable deprecation-sync warnings
We currently disable deprecation synchronization warnings in case we're
building with Clang. We check for Clang by doing a string comparison on
the compiler identification, but this seems to have been broken by an
update in macOS' image as the compiler ID has changed to "AppleClang".
Let's just unconditionally disable this warning on Unix platforms. We
never add the deprecated attribute anyway, so the warning doesn't help
us at all.
| -rw-r--r-- | CMakeLists.txt | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b3f7cca1..fb5202fd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,30 +231,27 @@ ELSE () ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO=1) ENDIF () - ENABLE_WARNINGS(documentation) - DISABLE_WARNINGS(missing-field-initializers) - ENABLE_WARNINGS(strict-aliasing) - ENABLE_WARNINGS(strict-prototypes) - ENABLE_WARNINGS(declaration-after-statement) - ENABLE_WARNINGS(shift-count-overflow) - ENABLE_WARNINGS(unused-const-variable) - ENABLE_WARNINGS(unused-function) - ENABLE_WARNINGS(int-conversion) + enable_warnings(documentation) + disable_warnings(documentation-deprecated-sync) + disable_warnings(missing-field-initializers) + enable_warnings(strict-aliasing) + enable_warnings(strict-prototypes) + enable_warnings(declaration-after-statement) + enable_warnings(shift-count-overflow) + enable_warnings(unused-const-variable) + enable_warnings(unused-function) + enable_warnings(int-conversion) # MinGW uses gcc, which expects POSIX formatting for printf, but # uses the Windows C library, which uses its own format specifiers. # Disable format specifier warnings. - IF(MINGW) - DISABLE_WARNINGS(format) - DISABLE_WARNINGS(format-security) - ELSE() - ENABLE_WARNINGS(format) - ENABLE_WARNINGS(format-security) - ENDIF() - - IF("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") - DISABLE_WARNINGS(documentation-deprecated-sync) - ENDIF() + if(MINGW) + disable_warnings(format) + disable_warnings(format-security) + else() + enable_warnings(format) + enable_warnings(format-security) + endif() ENDIF() # Ensure that MinGW provides the correct header files. |