osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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 <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2016-10-21 16:05:10 -07:00 committed by Anders Broman
parent 7dfaec969e
commit e858829404
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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)