From a12164ad5311da4fd15592819013110eeef5ee5f Mon Sep 17 00:00:00 2001 From: Michael Schuster Date: Sun, 20 Oct 2019 12:52:52 +0200 Subject: [PATCH] MSVC Fix for PR #1526: Fix clang's variadic macro warnings The recently merged #1526 caused the MSVC Builds on Windows to fail. This patch sets the new CMake flag only if the compiler it not MSVC. Signed-off-by: Michael Schuster --- src/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37cfd7325..9f854b006 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,12 +29,12 @@ if(NOT MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") endif() -endif() -# Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU -# extension (C++11 §16.3/4 forbids them). Silence clang's warnings. -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") + # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU + # extension (C++11 §16.3/4 forbids them). Silence clang's warnings. + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") +endif() if(WIN32) # Enable DEP & ASLR -- 2.30.2