diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-06-08 16:35:29 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-06-08 14:36:37 +0000 |
| commit | 9b4991098f42bfe10da9ce34c4c7711fbcf87ca7 (patch) | |
| tree | 0369cd2b8aa9d676cb7fb3c40428493ad61751ec | |
| parent | 561460160a4ae73bda9b92751ae5c35d4324bb87 (diff) | |
Linking against libgettext and libm got broken by
commit 561460160a4ae73bda9b92751ae5c35d4324bb87
Author: Graham Bloice <graham.bloice@trihedral.com>
Date: Fri May 16 20:43:17 2014 +0100
Update CMake build for win32 to build QT again, and to find
GLib and GThread libs
Fix that (basically it put them into the packagelist which got
*replaced* by the next set of things to test).
Change-Id: I0f43a17a7c7eb087c530f6336dc61f93b121fda8
Reviewed-on: https://code.wireshark.org/review/2035
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fa9e619ceb..bceff67901 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -427,10 +427,6 @@ endif() # - set HAVE_XXX #The minimum package list -if (NOT WIN32) - set(PACKAGELIST Gettext M) - set(M_REQUIRED TRUE) -endif() set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SED SH PythonInterp) set(GLIB2_REQUIRED TRUE) set(GLIB2_FIND_REQUIRED TRUE) @@ -438,6 +434,10 @@ set(GLIB2_MIN_VERSION 2.14.0) set(GTHREAD2_REQUIRED TRUE) set(PythonInterp_FIND_VERSION 2) set(Python_ADDITIONAL_VERSIONS 3) +if (NOT WIN32) + set(PACKAGELIST ${PACKAGELIST} Gettext M) + set(M_REQUIRED TRUE) +endif() set(PACKAGELIST ${PACKAGELIST} HtmlViewer) |