Package: kadu / 4.1-1.1

04-fix_compilation_error_c++14_vs_gnu++11.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
Description: Fixed compilation error caused by coliding
 -std=c++14 and -std=gnu++11
Author: Patryk Cisek <patryk@debian.org>
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8718de..e5cd430 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,8 @@ if (MSVC)
 else ()
 	set (COMMON_COMPILE_FLAGS "-Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -fno-common")
 	set (C_FLAGS "-Wwrite-strings")
-	set (CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 ${CXX_FLAGS}")
-	set (CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}")
+	set (CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor ${CXX_FLAGS}")
+        set(CMAKE_CXX_STANDARD 14)
 
 	if (NOT WIN32)
 		set (COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fvisibility=hidden")
-- 
2.10.2