git.samba.org - obnox/wireshark/wip.git/atom - CMakeLists.txt history git mirror of the wireshark svn http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git Michael Adam //www.samba.org/samba/style/2010/grey/favicon.ico //www.samba.org/samba/style/2010/samba_2010_logo_transparent_151x27.png 2012-02-19T08:59:17Z gitweb Reflect the move of dftest.c back to the top-level directory. 2012-02-19T08:59:17Z guy guy@f5534014-38df-0310-8fa8-9805f1628bb7 guy guy@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-19T08:59:17Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=19bcb34d1c4ebbb2240361878825d9bbfe53a564
Reflect the move of dftest.c back to the top-level directory.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41065 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Trying to fix the compile of ui/util.c on Windows by moving the 2012-02-17T16:59:14Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-17T16:59:14Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=d6a870c2859dd2e7a290e914309b8fe6d690e7c8
Trying to fix the compile of ui/util.c on Windows by moving the
source file directly into the sources variable - there seems to
be a subtle difference between ui/util.c and epan/crypt/md5.c


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41052 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Start moving files to ui/ and ui/cli/ 2012-02-17T12:30:27Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-17T12:30:27Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=cb8899ca451d1aceb8c5f88372ca64ef1bcf0644
Start moving files to ui/ and ui/cli/


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41047 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Last fix to the wrong approach. 2012-02-08T07:39:51Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-08T07:39:51Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=6326f06ddbd2de2395df27d6c50bd81aad1b944b
Last fix to the wrong approach.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40925 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Make sure that we only have to set (or pick up) the docdir environment 2012-02-07T08:05:11Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-07T08:05:11Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=f78c7d750a3042038fefc98879e29c8370760482
Make sure that we only have to set (or pick up) the docdir environment
variable on the initial cmake run and not on later re-runs (like when some
cmakelists.txt file changed and we call make).
Of course this value should really be passed as an option instead of an
environment variable but I want to document how to get the current approach
working properly before switching to the proper approach.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40913 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
From QA Cafe: 2012-02-05T10:39:12Z etxrab etxrab@f5534014-38df-0310-8fa8-9805f1628bb7 etxrab etxrab@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-05T10:39:12Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=95c50d004433018afc124657b70f25a1a6b217a3
From QA Cafe:
Add support to follow UDP and TCP streams like wireshark does. UDP streams are
selected with IP address/port pairs. TCP stream are selected with either the
stream index or IP address/port pairs.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6684

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40852 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Fix long standing but that prevented installation to 2012-02-05T07:41:53Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-05T07:41:53Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=d5808626c1ce9160a01ba6fa6d324dfce1aa2259
Fix long standing but that prevented installation to
work at all.
Next step ist to move docbook installation back into docbook/


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40846 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
- Add a comment how to improve the output of supported features later on. 2012-02-04T14:19:38Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-04T14:19:38Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=1a61f95656f7e6030666384e36744facf1b5dcb3
- Add a comment how to improve the output of supported features later on.
- Move docbook pdf installation to toplevel.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40840 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
- Move setting _U_ into config.h, because 2012-02-02T12:04:22Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-02T12:04:22Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=7326e8cb033ced26cb30c09f7f225b388ba050af
- Move setting _U_ into config.h, because
  a) C++ has a standardized way of marking parameters as unused
  b) cmakes autoquoting magic failed when the compiler wasn't gcc
     but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
  as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40807 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Prepare the cmake infrastucture for eventually building 2012-02-02T00:46:02Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-02-02T00:46:02Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=ae200cb16ebcee5714566eb392fd24846a2b04a5
Prepare the cmake infrastucture for eventually building
wireshark and qtshark simultanously.
The "only" missing thing for this is now ui/qt/CMakeLists.txt ;)


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40799 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Manually revert the changes to CMakeLists.txt from commit 40602 - they should not... 2012-01-20T11:02:15Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-01-20T11:02:15Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=cc8ebb8832ad7212c6179a0a30ad11a430077348
Manually revert the changes to CMakeLists.txt from commit 40602 - they should not be necessary/are wrong

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40605 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Bug 6448 says the embedded Python stuff does not really work. 2012-01-20T03:20:35Z morriss morriss@f5534014-38df-0310-8fa8-9805f1628bb7 morriss morriss@f5534014-38df-0310-8fa8-9805f1628bb7 2012-01-20T03:20:35Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=436ed0dec3dacb35fa7863200f32afdda1a50d35
Bug 6448 says the embedded Python stuff does not really work.
And if I run Valgrind with Python enabled, I get pages of errors related to it.

So: disable Python by default.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40602 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Reflect the move of recent.c from ui/gtk to the top-level directory. 2012-01-18T20:23:30Z guy guy@f5534014-38df-0310-8fa8-9805f1628bb7 guy guy@f5534014-38df-0310-8fa8-9805f1628bb7 2012-01-18T20:23:30Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=0532f673831ae4e73430cf5cd3609df40eadbbf9
Reflect the move of recent.c from ui/gtk to the top-level directory.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40565 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
move alert box for cmake builds as well 2012-01-16T03:25:55Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-01-16T03:25:55Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=36a23fde86acc9076acdf6cdd819b7c1d7501708
move alert box for cmake builds as well


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40542 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
alert_box.c moved to ui/ 2012-01-16T02:28:38Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-01-16T02:28:38Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=3872443876f1ac367fc54f95cd8db0265dc5ea2f
alert_box.c moved to ui/

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40538 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Move gtk to ui/gtk. 2012-01-15T21:59:11Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-01-15T21:59:11Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=c0faf6289a650f27c2f0820902f5142ae28b4422
Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40518 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Rename crypt-xxx to xxx 2012-01-15T12:29:44Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-01-15T12:29:44Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=506fb35656851334fc89fe41898e85d53fb5fda9
Rename crypt-xxx to xxx


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40511 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
Sync filelists between autofoo and cmake. 2012-01-13T19:29:58Z jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 jmayer jmayer@f5534014-38df-0310-8fa8-9805f1628bb7 2012-01-13T19:29:58Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=e8f11ba522e9a6c1d82877e511269fb4152de646
Sync filelists between autofoo and cmake.
Move some dissectors that throw warnings to DIRTY_
Whitespace cleanups


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40478 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before 2012-01-12T19:16:15Z gerald gerald@f5534014-38df-0310-8fa8-9805f1628bb7 gerald gerald@f5534014-38df-0310-8fa8-9805f1628bb7 2012-01-12T19:16:15Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=e743da9f1e204a6581b950a37ce5a71b089545cc
CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before
register_tap_files so that the "-z" flag works for TShark.

epan/stat_cmd_args.c: Fixup whitespace.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40443 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt
I had a capture_errs.c but capture-wpcap.c eated it. 2011-12-30T00:17:50Z guy guy@f5534014-38df-0310-8fa8-9805f1628bb7 guy guy@f5534014-38df-0310-8fa8-9805f1628bb7 2011-12-30T00:17:50Z http://git.samba.org/samba.git/?p=obnox/wireshark/wip.git;a=commitdiff;h=f82a6f564b347f1423b6788fbc39de798171caf1
I had a capture_errs.c but capture-wpcap.c eated it.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40339 f5534014-38df-0310-8fa8-9805f1628bb7
  • [D] CMakeLists.txt