aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2013-10-25Fix more SVN properties.Jeff Morriss1-0/+2
svn path=/trunk/; revision=52834
2013-10-19Minor refactoring in CMake ABI dump generationBalint Reczey1-0/+3
svn path=/trunk/; revision=52689
2013-10-19Set and use TMPDIR for ABI dump generation when using CMakeBalint Reczey1-2/+3
svn path=/trunk/; revision=52688
2013-10-15Factor out common parts of ABI checks to UseABICheck.cmakeBalint Reczey1-0/+20
svn path=/trunk/; revision=52614
2013-10-14Make pkgconfig work - sort of:Jörg Mayer1-9/+11
- fix a typo - Add the library dirs and not just the libraries. This would help if the paths that are now returned were actually correct. svn path=/trunk/; revision=52598
2013-10-13Don't clobber PKG_CONFIG_PATH.Gerald Combs1-1/+10
svn path=/trunk/; revision=52589
2013-10-13Set CMake to use Python when building the tap register files.Graham Bloice1-8/+8
svn path=/trunk/; revision=52581
2013-10-12Remove some things that I added while not understanding the realJörg Mayer1-3/+4
problem/solution. "Long" since solved by copying the solution from Makefile.nmake. Small update to the status of cmake builds on windows svn path=/trunk/; revision=52574
2013-10-11qtshark and wireshark(gtk2) now actually find their libs.Jörg Mayer1-1/+1
svn path=/trunk/; revision=52539
2013-10-11Now the GUI programs (wireshark/gtk2 and qtshark) compile and linkJörg Mayer1-0/+1
svn path=/trunk/; revision=52538
2013-10-11Make airpcap detection workJörg Mayer2-8/+15
svn path=/trunk/; revision=52535
2013-10-11Fix check for inflatePrime in zlib (ZLIB_LIBRARIES isn't set at thatGuy Harris1-1/+1
point, you want ZLIB_LIBRARY). svn path=/trunk/; revision=52532
2013-10-10Fix a few things - untested until current build finishes.Jörg Mayer1-7/+4
svn path=/trunk/; revision=52516
2013-10-10Don't check for pcap_version(); we don't use it.Guy Harris1-1/+0
Sort the #cmakedefines in cmakeconfig.h.in to more closely match the order in config.h.in, to make it easier to make sure CMake and autofoo are doing the same checks. Remove some #cmakedefines that don't correspond to check that are being done either by CMake or autofoo. svn path=/trunk/; revision=52515
2013-10-10Check for bpf_image(), just as the autoconf script does.Guy Harris1-0/+1
svn path=/trunk/; revision=52514
2013-10-10Add Airpcap detection, use it by default on win32Jörg Mayer1-0/+41
QT5 compile working - NOT. It's almost working, except that I *still* need to get GTK detection working on Win :-( svn path=/trunk/; revision=52513
2013-10-10lib is required for linking, the dlls are in binJörg Mayer1-0/+2
And with this change, I'm finally able to run the executables in the top builddir. svn path=/trunk/; revision=52498
2013-10-10Generate setpath.bat to set the paths necessary for runningJörg Mayer1-1/+30
the generated binaries inside the build dir. svn path=/trunk/; revision=52492
2013-10-10Revert "Fix using fop from CMake"Balint Reczey1-2/+2
This reverts commit r52484 svn path=/trunk/; revision=52488
2013-10-10Fix using fop from CMakeBalint Reczey1-2/+2
svn path=/trunk/; revision=52484
2013-10-07Try to get gtk3 detection working via pkg-configJörg Mayer1-1/+1
(not yet working). svn path=/trunk/; revision=52432
2013-10-06Use the correct syntax for the shellJörg Mayer1-1/+1
svn path=/trunk/; revision=52425
2013-10-06Libwireshark now links on windows with cmakeJörg Mayer1-0/+1
svn path=/trunk/; revision=52424
2013-10-06Fix a typoJörg Mayer1-1/+1
svn path=/trunk/; revision=52418
2013-10-06Make FindGTK3 work againJörg Mayer1-21/+24
svn path=/trunk/; revision=52416
2013-10-06Missed this part of Grahams patch.Jörg Mayer1-0/+134
svn path=/trunk/; revision=52411
2013-10-06Finding GTK3 works now, but the list of libs is incompleteJörg Mayer1-15/+32
svn path=/trunk/; revision=52408
2013-10-06Rewrite FindPCAP.cmake to current practicesJörg Mayer1-127/+58
svn path=/trunk/; revision=52405
2013-10-05Fix a typo (letover from autotools times) which accidentallyJörg Mayer1-1/+1
worked with cmake on unix but not on windows svn path=/trunk/; revision=52384
2013-10-05editcap and capinfos compile now with cmakeJörg Mayer1-0/+2
svn path=/trunk/; revision=52382
2013-10-05Attempt to get linking working with cmake - without success so far.Jörg Mayer1-0/+17
svn path=/trunk/; revision=52377
2013-10-04Make runlex.sh work on WindowsJörg Mayer2-7/+14
svn path=/trunk/; revision=52373
2013-10-04Looks like we have problems invoking shell scripts fromJörg Mayer1-2/+1
cmake on windows - so explicitely run the shell with the script as argument svn path=/trunk/; revision=52372
2013-10-04Get pod2man to work on windows: call via perlJörg Mayer1-2/+2
svn path=/trunk/; revision=52367
2013-10-04Add a missing file on the Windows platform.Jörg Mayer3-3/+28
Add missing $Id$ tags. svn path=/trunk/; revision=52364
2013-10-04Add Win support (and add a "hacked" case where the zlibJörg Mayer1-2/+14
stuff has been compiled in place but not installed) svn path=/trunk/; revision=52363
2013-10-04Detecting these modules finally works on Windows setupJörg Mayer2-4/+4
svn path=/trunk/; revision=52361
2013-10-04Cleanup similar to FindGTHREAD2.cmakeJörg Mayer1-33/+22
svn path=/trunk/; revision=52360
2013-10-04Remove now unneeded stuff missed by previous cleanup.Jörg Mayer1-19/+0
svn path=/trunk/; revision=52359
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-10-04Update coding style, use FIND_PACKAGE_HANDLE_STANDARD_ARGSJörg Mayer1-23/+22
instead of doing handmade stuff to the same effect. svn path=/trunk/; revision=52352
2013-10-04Fix a typoJörg Mayer1-2/+2
svn path=/trunk/; revision=52351
2013-10-04Fogot to set the <package>_INCLUDE_DIRS variable, thus itJörg Mayer2-3/+14
would only work on platforms where the required path got set for another package svn path=/trunk/; revision=52350
2013-09-27Fix a typo (a missed replace)Jörg Mayer1-2/+2
svn path=/trunk/; revision=52234
2013-09-23Beginnings of win cmake support (not yet working), created by Graham Bloice,Jörg Mayer14-41/+128
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
2013-09-17When building packet-dap.c on an empty build tree, packet-dap.c wouldJörg Mayer1-0/+1
be incorrect on the first pass and only be correct when remade. The reason was that disp-exp.cnf was created incorrectly on first pass. disp-exp.cnf required dop-exp.cnf to build correctly, so add a mechanism to add dependencies for export files. Note: Only the cmake change has been tested, the autofoo stuff requires testing. svn path=/trunk/; revision=52120
2013-08-12- Extract variables from Makefile.common.Jörg Mayer1-0/+53
- Apply this to asn1/c1222/ svn path=/trunk/; revision=51324
2013-07-24Fix a bug that will prevent the extra flags from being honored.Jörg Mayer1-1/+1
svn path=/trunk/; revision=50876
2013-07-24Copy over from cmake git head as it fixes a bug:Jörg Mayer1-0/+57
The detection will not work if the locale is non-English svn path=/trunk/; revision=50875