37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
|
source: https://github.com/nextcloud/desktop/pull/3132
|
||
|
|
|
||
|
|
From 52951820b2c094bcff0ec1a36c3c89d1c08c9618 Mon Sep 17 00:00:00 2001
|
||
|
|
From: yopito <pierre.bourgin@free.fr>
|
||
|
|
Date: Wed, 14 Apr 2021 22:07:19 +0200
|
||
|
|
Subject: [PATCH] clang's variadic macro warnings: only for clang
|
||
|
|
|
||
|
|
following settings of cmake/modules/Warnings.cmake
|
||
|
|
---
|
||
|
|
src/CMakeLists.txt | 10 ++++++----
|
||
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git src/CMakeLists.txt src/CMakeLists.txt
|
||
|
|
index f29349582..6f3145331 100644
|
||
|
|
--- src/CMakeLists.txt
|
||
|
|
+++ src/CMakeLists.txt
|
||
|
|
@@ -30,10 +30,12 @@ if(NOT MSVC)
|
||
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
|
||
|
|
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")
|
||
|
|
+ if (CMAKE_CXX_COMPILER MATCHES "Clang")
|
||
|
|
+ # 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()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(WIN32)
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|