From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 14 Aug 2014 00:27:26 +0000 (-0700)
Subject: CMake: More Qt5WinExtras plumbing.
X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=4388b5608abbde4953cdf2b00f3711614c3db4db

CMake: More Qt5WinExtras plumbing.

Change-Id: I7474e8373668ba554d3574193fec59daceafe00d
Reviewed-on: https://code.wireshark.org/review/3588
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa377eedac..2fa57e095c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -713,6 +713,10 @@ if (Qt5Widgets_FOUND)
 		# That's the name autofoo uses
 		set(QT_MACEXTRAS_LIB 1)
 	endif()
+	if(Qt5WinExtras_FOUND)
+		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5WinExtras_LIBRARIES})
+		# set(QT_WINEXTRAS_LIB 1) # Not needed?
+	endif()
 # If Qt4: QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic
 elseif(QT_FOUND)
 	include(${QT_USE_FILE})
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index a3784271ca..6c4df84143 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -350,6 +350,9 @@
 /* Define if we have QtMacExtras */
 #cmakedefine QT_MACEXTRAS_LIB 1
 
+/* Define if we have QtWinExtras */
+/* #cmakedefine QT_WINEXTRAS_LIB 1 */
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine WORDS_BIGENDIAN 1