aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Bloice <graham.bloice@trihedral.com>2017-11-14 15:36:57 +0000
committerGraham Bloice <graham.bloice@trihedral.com>2017-11-14 16:46:07 +0000
commitc43c58c434cced3df2e208094d1891e8447e0cfc (patch)
treeee0937c69bda4dda28c4d4837f05cbe4f006a6ac
parentb4fc532372f0add6bf1434a54aa1a3a457ab3a88 (diff)
CMake: Make Qt5 packages required if building Qt version
This stops folks failing when they don't have Qt but are still attempting to build the Qt version. Change-Id: I31eb9433b25ca9a717cd10bc165f3820ae31687e Reviewed-on: https://code.wireshark.org/review/24406 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-rw-r--r--CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c32f96e76..d6a6c3257f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -881,11 +881,19 @@ if(BUILD_wireshark)
Qt5Svg
Qt5Widgets
)
+ set(Qt5Core_OPTIONS REQUIRED)
+ set(Qt5LinguistTools_OPTIONS REQUIRED)
+ set(Qt5Multimedia_OPTIONS REQUIRED)
+ set(Qt5PrintSupport_OPTIONS REQUIRED)
+ set(Qt5Svg_OPTIONS REQUIRED)
+ set(Qt5Widgets_OPTIONS REQUIRED)
if (APPLE)
set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
+ set(Qt5MacExtras_OPTIONS REQUIRED)
endif()
if( WIN32 )
set(PACKAGELIST ${PACKAGELIST} Qt5WinExtras)
+ set(Qt5WinExtras_OPTIONS REQUIRED)
endif()
set(QT_VERSION 5)
else()