summaryrefslogtreecommitdiff
path: root/cmake/modules/FindGLIB2.cmake
AgeCommit message (Collapse)AuthorFilesLines
2017-02-17CMake: Move the search for libgcc_s to GLib.Gerald Combs1-0/+1
Move the search for the libgcc_s_seh and _sjlj DLLs to the GLib directory. That's the only place it currently exists on the 64-bit builder. Change-Id: Icf55dacf061d9423e78cabeaf16aa539ccb619bb Reviewed-on: https://code.wireshark.org/review/20162 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-13CMake: Copy libwireshark dependent DLLs to the target directory.Gerald Combs1-10/+27
Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01cmake: use pkg-config for resolving dependenciesPeter Wu1-3/+3
Changes: * Fix glib2 search path. * Add pkg-config support to CAP, GEOIP, GNUTLS, LUA, PortAudio (API 19), zlib, kerberos. * Add pkg-config support to libnl3, libnl2 and libnl1 (but tested only with libnl3). This makes it easier to do 32-bit builds on 64-bit hosts by just setting `PKG_CONFIG_LIBDIR`. Due to how HINTS work, it is still fragile though: missing 32-bit libraries will cause a fallback to 64-bit libraries. A future patch could check for `<PREFIX>_FOUND` and remove the manual `find_path` and `find_library` hackery since the paths are already known. Change-Id: Ieb4fb74695c96afb1a4c70168e84abb1fa4612c6 Reviewed-on: https://code.wireshark.org/review/4292 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17It's so simple: If we require a package but provide alternative methodsJoerg Mayer1-7/+4
of finding the package don't allow the first method to fail terminally. Todo: Fix this in all other places as well. Change-Id: I5a343fac33f6a5d6e50ff353d739459b2e36711a Reviewed-on: https://code.wireshark.org/review/2300 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16Undo Graham's change to find the "correct" fixJoerg Mayer1-6/+6
Change-Id: Ifc368687da972231298ab5935d071a84edd3e56e Reviewed-on: https://code.wireshark.org/review/2261 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-08Update CMake build for win32 to build QT again, and to findGraham Bloice1-6/+6
GLib and GThread libs Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a Reviewed-on: https://code.wireshark.org/review/2010 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-01Graham BloiceJörg Mayer1-3/+11
- Using gtk[23] is a hack. Implement a clean solution. Me - In the current setup, building Qt ONLY is not supported as lots of required support libraries are only found in gtk2 and gtk3. Print an error in that case. - Small style changes (lowercasing, whitespace) svn path=/trunk/; revision=53692
2013-10-04Remove a debug "printf"Jörg Mayer1-2/+0
svn path=/trunk/; revision=52358
2013-10-04Replace the old version by a more modern one that onlyJörg Mayer1-246/+100
tries to find glib2 and not other stuff as well. Not tested on OS X due to problems with my build environment. svn path=/trunk/; revision=52356
2013-09-23Beginnings of win cmake support (not yet working), created by Graham Bloice,Jörg Mayer1-0/+8
some smaller changes by me. - README.cmake Document how to (one day) run on Windows - CMakeLists.txt Use MSVC compiler flags for MSVC instead of gcc flags - FindWSWinLibs.cmake New: Creates HINTS for finding includes and libraries inside the Wireshark support library installation. - FindXXX.cmake Make use of HINTS generated by FindWSWinLibs.cmake This has not really been tested on Windows as my installation seems to have automagically downloaded some fixes and is in an inconsistent state since. Will probably need to reinstall. svn path=/trunk/; revision=52194
2011-08-05Add call to FindPackageHandleStandardArgsJörg Mayer1-0/+1
svn path=/trunk/; revision=38361
2011-08-05Attempt to properly fix the missing path information for glib librariesJörg Mayer1-106/+112
svn path=/trunk/; revision=38360
2010-09-25- FindGLIB2.cmake updates fromJörg Mayer1-173/+199
http://www.opensync.org/browser/branches/3rd-party-cmake-modules/modules + split out FindGMODULE2.cmake + contains /sw/... by default + supposedly tested on OSX - Disable pcre for cmake builds by default, gregex should be picked up automatically if glib2 is not too old. Should you have trouble linking due to some libgmodule... stuff undefined, please add "${GMODULE2_LIBRARIES}" after "${GLIB2_LIBRARIES}" an report back. svn path=/trunk/; revision=34248
2009-09-23- Add $Id: $ tagsJörg Mayer1-1/+4
- FindHtmlViewer.cmake: Try to add reading the name of the html viewer from the HTML_VIEWER environment variable (untested) svn path=/trunk/; revision=30104
2009-09-23Removed setting GLIB2_LIBRARIES to GLIB_LIBRARY, to improve build on OSX.Stig Bjørlykke1-3/+0
svn path=/trunk/; revision=30099
2009-08-18Search for includes and libs in /opt/local/ (MacPorts).Stig Bjørlykke1-0/+1
svn path=/trunk/; revision=29465
2008-07-18Remove iconv/libiconv checks from *NIX builds: GLIB-2 provides iconv ↵Jeff Morriss1-33/+0
replacements. svn path=/trunk/; revision=25765
2006-10-24Parts of http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1179Jörg Mayer1-98/+215
Frederic Heem: * More cmake system checks. It compiles dumpcap without running configure, svn path=/trunk/; revision=19672
2006-09-06cmake/Jörg Mayer1-0/+127
Add some more (hackish) tests. Add a LICENSE file until I find the time to add it to all files individually. CMakeLists.txt Add some addiotional stuff regarding options. Add (non-working) code to generate config.h Handle GTK1 vs GTK2 and GLIB1 vs GLIB2 svn path=/trunk/; revision=19168