Try to locate QtMacExtras.
authorGerald Combs <gerald@wireshark.org>
Thu, 10 Oct 2013 23:11:19 +0000 (23:11 -0000)
committerGerald Combs <gerald@wireshark.org>
Thu, 10 Oct 2013 23:11:19 +0000 (23:11 -0000)
svn path=/trunk/; revision=52518

CMakeLists.txt
cmakeconfig.h.in

index afa4751ac1d6e4151c0e30cbecba52e1169d3823..4a5262c7f20beb9368b75443763cb8303df6476c 100644 (file)
@@ -367,6 +367,9 @@ endif()
 if(BUILD_qtshark)
        if(ENABLE_QT5)
                set(PACKAGELIST ${PACKAGELIST} Qt5Widgets Qt5PrintSupport Qt5LinguistTools)
+               if (APPLE)
+                       set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
+               endif()
                set(QT_VERSION 5)
                # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
                # somewhere. The if WIN32 in this place is annoying as well.
@@ -545,6 +548,11 @@ if (Qt5Widgets_FOUND)
        endif()
        set (QT_FOUND ON)
        set (QT_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES})
+       if(Qt5MacExtras_FOUND)
+               set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+               # That's the name autofoo uses
+               set(QT_MACEXTRAS_LIB 1)
+       endif()
 # If Qt4: QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic
 elseif(QT_FOUND)
        include(${QT_USE_FILE})
index 370a264acf2aff3b0a59ac46bf7cc7073aa7883b..6bf1d95a8194015b01094cb15e169c3c63d0e9c2 100644 (file)
 /* Define to use libportaudio library */
 #cmakedefine HAVE_LIBPORTAUDIO 1
 
+/* Define if we have QtMacExtras */
+#cmakedefine QT_MACEXTRAS_LIB 1
+
 /* Define to 1 if you have the `smi' library (-lsmi). */
 #cmakedefine HAVE_LIBSMI 1