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 fa377eedacb4b5c3e969b0931518e46b4255e8d4..2fa57e095cf7fbfb054d28745e0c49ee9460251b 100644 (file)
--- 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 a3784271cac45f652079a63d4868402b90f29957..6c4df841432454bbed0488da29279aa6c98971bf 100644 (file)
--- 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