]> git.proxmox.com Git - ceph.git/blob - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / vtk / 0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch
1 From 20dd0370d7ad685b7fbdb1625ffec60c940980f3 Mon Sep 17 00:00:00 2001
2 From: Ben Boeckel <ben.boeckel@kitware.com>
3 Date: Fri, 17 Apr 2020 15:02:15 -0400
4 Subject: [PATCH 2/2] Qt: enforce QT_NO_KEYWORDS builds by VTK itself
5
6 ---
7 GUISupport/Qt/CMakeLists.txt | 1 +
8 Views/Qt/CMakeLists.txt | 1 +
9 2 files changed, 2 insertions(+)
10
11 diff --git a/GUISupport/Qt/CMakeLists.txt b/GUISupport/Qt/CMakeLists.txt
12 index bfa63a94f1..3fc6fe4bd9 100644
13 --- a/GUISupport/Qt/CMakeLists.txt
14 +++ b/GUISupport/Qt/CMakeLists.txt
15 @@ -47,4 +47,5 @@ vtk_module_add_module(VTK::GUISupportQt
16 HEADERS ${headers}
17 PRIVATE_HEADERS ${private_headers})
18
19 +vtk_module_definitions(VTK::GUISupportQt PRIVATE QT_NO_KEYWORDS)
20 vtk_module_link(VTK::GUISupportQt PUBLIC Qt5::Widgets)
21 diff --git a/Views/Qt/CMakeLists.txt b/Views/Qt/CMakeLists.txt
22 index 7684118e40..b697571dd2 100644
23 --- a/Views/Qt/CMakeLists.txt
24 +++ b/Views/Qt/CMakeLists.txt
25 @@ -17,4 +17,5 @@ set(CMAKE_AUTOMOC 1)
26 vtk_module_add_module(VTK::ViewsQt
27 CLASSES ${classes})
28
29 +vtk_module_definitions(VTK::ViewsQt PRIVATE QT_NO_KEYWORDS)
30 vtk_module_link(VTK::ViewsQt PRIVATE Qt5::Widgets)
31 --
32 2.30.0.windows.1
33