summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2013-10-11With Gerald's patch we should no longer require GTK includes for QT-Only buildsJörg Mayer1-10/+0
(untested). svn path=/trunk/; revision=52555
2013-10-11The env variable is QT5_BASE_DIR, as documented in README.cmakeJörg Mayer1-1/+1
Make documentation and implementatoin consistent svn path=/trunk/; revision=52541
2013-10-11The path for the Qt5 installation now needs to be set as aJörg Mayer1-1/+1
windows environment variable. svn path=/trunk/; revision=52540
2013-10-11qtshark and wireshark(gtk2) now actually find their libs.Jörg Mayer1-5/+4
svn path=/trunk/; revision=52539
2013-10-11Now the GUI programs (wireshark/gtk2 and qtshark) compile and linkJörg Mayer1-4/+9
svn path=/trunk/; revision=52538
2013-10-10Try to locate QtMacExtras.Gerald Combs1-0/+8
svn path=/trunk/; revision=52518
2013-10-10Add Airpcap detection, use it by default on win32Jörg Mayer1-13/+38
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-10Generate setpath.bat to set the paths necessary for runningJörg Mayer1-0/+3
the generated binaries inside the build dir. svn path=/trunk/; revision=52492
2013-10-10The path approach can't work this way: Trying to set an environmentJörg Mayer1-21/+5
variable of our parent process isn't going to work. Plan B is to write this stuff into a file and manually run it once. Hard code the QT5 search path on Windows for now. svn path=/trunk/; revision=52489
2013-10-08Try to set PATH on Windows to all required dlls/libs to allowJörg Mayer1-0/+22
running the executables from the build tree without installation. It doesn't really work yet but the troubleshooting has to wait until either I've gotten some sleep or someone else fixes it. svn path=/trunk/; revision=52454
2013-10-06Remove an uncommented line: The file is now part of wsutilJörg Mayer1-1/+0
svn path=/trunk/; revision=52426
2013-10-06Add a comment about PCAP_VERSIONJörg Mayer1-0/+1
svn path=/trunk/; revision=52409
2013-10-06Hack around the "/MD overridden by /MDd" messages.Jörg Mayer1-1/+1
Better solutions welcome. svn path=/trunk/; revision=52396
2013-10-05Attempt to get linking working with cmake - without success so far.Jörg Mayer1-0/+3
svn path=/trunk/; revision=52377
2013-10-04The PERL variable name is deprecated, use PERL_EXECUTABLE instead.Jörg Mayer1-4/+4
svn path=/trunk/; revision=52368
2013-09-30Don't link qtshark against portaudioJörg Mayer1-1/+0
svn path=/trunk/; revision=52283
2013-09-23Beginnings of win cmake support (not yet working), created by Graham Bloice,Jörg Mayer1-78/+105
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-10Homebrew installs gettext (including libintl, which GLib requires) inGerald Combs1-0/+7
/usr/local/opt/gettext. Tell CMake to update our include and library paths accordingly. svn path=/trunk/; revision=51943
2013-08-13Implement in cmake:Jörg Mayer1-0/+4
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322 > User: guy > Date: 2013/08/12 01:01 PM > > Log: > Just check whether dladdr() is available; we check in the code whether > it succeeds, so there's no point in checking whether it succeeds in a > sample program. svn path=/trunk/; revision=51334
2013-08-03Allow the python interpreter to be version 3 (2 being preferred)Jörg Mayer1-0/+1
svn path=/trunk/; revision=51128
2013-08-02Print the flag we are testingJörg Mayer1-0/+2
svn path=/trunk/; revision=51116
2013-08-01TShark links with libui so we should always build it.Gerald Combs1-4/+1
svn path=/trunk/; revision=51101
2013-08-01Move a bunch of the crypt modules and pint.h into wsutil.Jeff Morriss1-1/+0
This means wsutil now links against libcrypt. Protect a bunch of the crypt header files from multiple inclusion. svn path=/trunk/; revision=51100
2013-07-23Use largefile detection in cmake.Jörg Mayer1-0/+4
Move wiretap/file_wrapper.c back to clean sources. svn path=/trunk/; revision=50825
2013-07-23Looks like not every version of cmake has the same behaviour wrtJörg Mayer1-1/+1
the working directory. So hardcode the path in a case where it didn't work for everyone. svn path=/trunk/; revision=50817
2013-07-22Wrap clang specific tests into a clang tests instead of checkingJörg Mayer1-11/+16
for APPLE. Move 3 of the 4 tests out of this check because the improved checks should detect them correctly now svn path=/trunk/; revision=50789
2013-07-22Don't use the program name to identify the compiler - it won't workJörg Mayer1-2/+1
reliably in cases where the compiler is name /usr/bin/cc Use the internal variable CMAKE_<LANG>_COMPILER_ID instead, which is finally documented (but still called internal in the docs), see http://www.cmake.org/cmake/help/v2.8.10/cmake.html#variable:CMAKE_LANG_COMPILER_ID svn path=/trunk/; revision=50784
2013-07-21Try to generate an error when calling clang with an unknown compilerJörg Mayer1-6/+13
option. This behaviour changed in clang, see https://bugzilla.mozilla.org/show_bug.cgi?id=731316 svn path=/trunk/; revision=50760
2013-07-21Enable echld builds with cmake when building with ENABLE_ECHLD=ONJörg Mayer1-0/+4
svn path=/trunk/; revision=50751
2013-07-21Don't check for "APPLE" if what you really mean is "clang"Jörg Mayer1-1/+2
svn path=/trunk/; revision=50749
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss1-2/+0
svn path=/trunk/; revision=50656
2013-07-16Move u3.{h,c} and g711.{h,c} into wsutil.Jeff Morriss1-2/+0
Project g711.h against multiple inclusion and add C++ compatibility wrapper. svn path=/trunk/; revision=50654
2013-07-16Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specificJeff Morriss1-2/+0
there and moving it avoids having to recompile the file for use in editcap and mergecap (which don't link against libwireshark). svn path=/trunk/; revision=50650
2013-07-15Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific ↵Jeff Morriss1-1/+0
there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark). svn path=/trunk/; revision=50598
2013-07-14Don't use compiler options not supported by clang in XCode 4.6.3Michael Tüxen1-4/+8
on Apple platforms. svn path=/trunk/; revision=50576
2013-07-12Move the print modules into epan.Jeff Morriss1-13/+0
svn path=/trunk/; revision=50526
2013-07-12Move disabled_protos.{h,c} into epan.Jeff Morriss1-1/+0
svn path=/trunk/; revision=50521
2013-07-11Move some more modules into epan.Jeff Morriss1-2/+0
svn path=/trunk/; revision=50517
2013-07-11packet dissection now takes pointer to tvb instead of guint8 dataJakub Zawadzki1-0/+1
implement frame_tvbuff, right now almost a copy of 'real' tvb. svn path=/trunk/; revision=50497
2013-07-10Add strnatcmp by Martin Pool for 'natural order' string comparisons, and ↵Chris Maynard1-0/+2
make use of it in editcap and mergecap for listing encapsulation types. For example: Before: user0 - USER 0 user1 - USER 1 user10 - USER 10 user11 - USER 11 user12 - USER 12 user13 - USER 13 user14 - USER 14 user15 - USER 15 user2 - USER 2 user3 - USER 3 user4 - USER 4 user5 - USER 5 user6 - USER 6 user7 - USER 7 user8 - USER 8 user9 - USER 9 After: user0 - USER 0 user1 - USER 1 user2 - USER 2 user3 - USER 3 user4 - USER 4 user5 - USER 5 user6 - USER 6 user7 - USER 7 user8 - USER 8 user9 - USER 9 user10 - USER 10 user11 - USER 11 user12 - USER 12 user13 - USER 13 user14 - USER 14 user15 - USER 15 svn path=/trunk/; revision=50482
2013-06-27For now, don't turn on -Wcast-align by default. There are at least someGuy Harris1-1/+1
bugs it points out that probably mean the code won't work on machines that require alignment (e.g., SPARC machines), but we'll turn it on once we fix them. (clang is fussier than GCC about this.) svn path=/trunk/; revision=50187
2013-06-26Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.Jeff Morriss1-3/+1
svn path=/trunk/; revision=50165
2013-06-26Move tempfile.{h,c} into wsutil.Jeff Morriss1-3/+0
svn path=/trunk/; revision=50163
2013-06-26editcap no longer has to link against nstime.o, it's in libwsutil now.Jeff Morriss1-1/+0
svn path=/trunk/; revision=50161
2013-06-25Move a couple of time-related modules into wsutil.Jeff Morriss1-1/+0
A bunch of files didn't really need to include these header files so remove the include line rather than changing it. svn path=/trunk/; revision=50154
2013-06-01Update various warning-option lists to match what the configure scriptGuy Harris1-19/+14
adds by default. svn path=/trunk/; revision=49670
2013-06-01Move -Wlogical-op to list of standard compiler flags for c-only.Jörg Mayer1-1/+1
svn path=/trunk/; revision=49668
2013-05-22capture_unix_ifnames.c is gone.Guy Harris1-1/+1
svn path=/trunk/; revision=49490
2013-05-14Suppress warnings when using Apple's C compiler.Michael Tüxen1-2/+4
svn path=/trunk/; revision=49305
2013-05-07Move common code into UseAsn2Wrs.cmake.Jörg Mayer1-0/+1
Include the new file. Use the new file. Add cmake support to rebuild the gsm_map dissector. svn path=/trunk/; revision=49194
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-28 16:31:18 +0000