From e85882940419dd9ce012489689e13ae4b18be04e Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 21 Oct 2016 16:05:10 -0700 Subject: [PATCH] CMake: Disable Qt4 && (Windows || macOS). We haven't built the Windows and macOS installers with Qt4 for quite some time. In the case of macOS+Qt4 it looks like there's a problem with the main screen size (bug 13009) and it's a safe bet that there are other problems. There's not much we can do exept say "don't do that." Do so at build time rather than after the user has installed Wireshark and is trying to use it. Change-Id: I22f47b9705ea044238046676b6336aa5feab3f60 Reviewed-on: https://code.wireshark.org/review/18364 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5403a5243..2a4811ed96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1057,7 +1057,7 @@ if (Qt5Widgets_FOUND) set(MOC_OPTIONS -nn) endif() # If Qt4: QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic -elseif(QT_FOUND) +elseif(Qt4_FOUND) include(${QT_USE_FILE}) include_directories(${QT_INCLUDE_DIR}) message(STATUS "Qt includes: ${QT_INCLUDE_DIR}") @@ -1075,6 +1075,9 @@ elseif(QT_FOUND) set(MOC_OPTIONS -nn) endif() endif() + if(WIN32 OR APPLE) + message(FATAL_ERROR "Windows and macOS builds should use Qt5.") + endif() endif() if(ENABLE_CHECKHF_CONFLICT)