aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-11-17 12:33:47 -0800
committerGerald Combs <gerald@wireshark.org>2015-11-17 22:45:44 +0000
commite3eb9f32081dafd97e058bf292e130e511f33748 (patch)
tree73d9ddb82094da3b0a58bbad0ad2a00dad00f0b8
parent52e95fb075aae84c321a5eb1ccc7338f9bf381cc (diff)
CMake: Add Qt5Svg to PACKAGELIST.
...otherwise we won't copy it to ${CMAKE_BINARY_DIR}/run/Wireshark.app on OS X, which means our flag icons won't be displayed. Bug: 11697 Change-Id: I26cd6a2dd13be35f9a80fd93adc8248848df5978 Reviewed-on: https://code.wireshark.org/review/11923 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da295b1d50..7827725ad5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -690,6 +690,7 @@ if(BUILD_wireshark)
Qt5LinguistTools
Qt5Multimedia
Qt5PrintSupport
+ Qt5Svg
Qt5Widgets
)
if (APPLE)
@@ -935,6 +936,11 @@ if (Qt5Widgets_FOUND)
# That's the name autofoo uses
set(QT_MULTIMEDIA_LIB 1)
endif()
+ if(Qt5Svg_FOUND)
+ set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
+ # That's the name autofoo uses
+ set(QT_SVG_LIB 1)
+ endif()
if(Qt5MacExtras_FOUND)
set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
# That's the name autofoo uses