mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 20:28:59 +08:00
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From 20dd0370d7ad685b7fbdb1625ffec60c940980f3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ben Boeckel <ben.boeckel@kitware.com>
|
||
|
|
Date: Fri, 17 Apr 2020 15:02:15 -0400
|
||
|
|
Subject: [PATCH 2/2] Qt: enforce QT_NO_KEYWORDS builds by VTK itself
|
||
|
|
|
||
|
|
---
|
||
|
|
GUISupport/Qt/CMakeLists.txt | 1 +
|
||
|
|
Views/Qt/CMakeLists.txt | 1 +
|
||
|
|
2 files changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/GUISupport/Qt/CMakeLists.txt b/GUISupport/Qt/CMakeLists.txt
|
||
|
|
index bfa63a94f1..3fc6fe4bd9 100644
|
||
|
|
--- a/GUISupport/Qt/CMakeLists.txt
|
||
|
|
+++ b/GUISupport/Qt/CMakeLists.txt
|
||
|
|
@@ -47,4 +47,5 @@ vtk_module_add_module(VTK::GUISupportQt
|
||
|
|
HEADERS ${headers}
|
||
|
|
PRIVATE_HEADERS ${private_headers})
|
||
|
|
|
||
|
|
+vtk_module_definitions(VTK::GUISupportQt PRIVATE QT_NO_KEYWORDS)
|
||
|
|
vtk_module_link(VTK::GUISupportQt PUBLIC Qt5::Widgets)
|
||
|
|
diff --git a/Views/Qt/CMakeLists.txt b/Views/Qt/CMakeLists.txt
|
||
|
|
index 7684118e40..b697571dd2 100644
|
||
|
|
--- a/Views/Qt/CMakeLists.txt
|
||
|
|
+++ b/Views/Qt/CMakeLists.txt
|
||
|
|
@@ -17,4 +17,5 @@ set(CMAKE_AUTOMOC 1)
|
||
|
|
vtk_module_add_module(VTK::ViewsQt
|
||
|
|
CLASSES ${classes})
|
||
|
|
|
||
|
|
+vtk_module_definitions(VTK::ViewsQt PRIVATE QT_NO_KEYWORDS)
|
||
|
|
vtk_module_link(VTK::ViewsQt PRIVATE Qt5::Widgets)
|
||
|
|
--
|
||
|
|
2.30.0.windows.1
|
||
|
|
|