1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
commit 3793b47b6f57a627911bcce819b1ecc2dc9e422a
Author: Kevin Funk <kfunk@kde.org>
Date: Wed Jan 18 13:34:55 2017 +0100
Fix compilation with new KDECompilerSettings.cmake
diff --git a/app/utils/libopencv.h.cmake.in b/app/utils/libopencv.h.cmake.in
index cc58b7c..6abf642 100644
--- a/app/utils/libopencv.h.cmake.in
+++ b/app/utils/libopencv.h.cmake.in
@@ -27,7 +27,7 @@
#define LIB_OPEN_CV_H
// Pragma directives to reduce warnings from OpenCV header files.
-#if not defined(__APPLE__) && defined(__GNUC__)
+#if !defined(__APPLE__) && defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
@@ -82,7 +82,7 @@
#endif
// Restore warnings
-#if not defined(__APPLE__) && defined(__GNUC__)
+#if !defined(__APPLE__) && defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt
index c5d9c27..14a7180 100644
--- a/libs/database/CMakeLists.txt
+++ b/libs/database/CMakeLists.txt
@@ -10,6 +10,9 @@ if (POLICY CMP0063)
cmake_policy(SET CMP0063 NEW)
endif (POLICY CMP0063)
+# Boost uses operator names (and, not, ...)
+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
set(libdatabasecore_SRCS
server/databaseserverstarter.cpp
server/databaseservererror.cpp
diff --git a/libs/dimg/CMakeLists.txt b/libs/dimg/CMakeLists.txt
index 3bcada5..04a0a22 100644
--- a/libs/dimg/CMakeLists.txt
+++ b/libs/dimg/CMakeLists.txt
@@ -11,6 +11,9 @@ endif (POLICY CMP0063)
kde_enable_exceptions()
+# Boost uses operator names (and, not, ...)
+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
set(libdimg_SRCS
dimg.cpp
drawdecoding.cpp
commit b318820530a4f001bc6621532b5416bf3c4a43cf
Author: Kevin Funk <kfunk@kde.org>
Date: Wed Jan 18 15:20:36 2017 +0100
tests/dimg needs -fno-operator-names dropped, too
diff --git a/tests/dimg/CMakeLists.txt b/tests/dimg/CMakeLists.txt
index 6d9e6d6..5133f88 100644
--- a/tests/dimg/CMakeLists.txt
+++ b/tests/dimg/CMakeLists.txt
@@ -8,6 +8,9 @@ if (POLICY CMP0063)
cmake_policy(SET CMP0063 NEW)
endif (POLICY CMP0063)
+# Boost uses operator names (and, not, ...)
+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
include_directories(
$<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
|
GitWeb
