diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-02-28 17:44:27 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-16 04:40:55 +0000 |
| commit | dabbaaf4189b88ae76870f7724c07f458c1e8b17 (patch) | |
| tree | f6b72fb99398bbdad21b320fa5341bbd9de15396 /README.cmake | |
| parent | 897f9f7cca117b54e62c171d49ec77ac6e8b88a6 (diff) | |
filesystem: Fix build dir detection when using cmake
Fixes loading of plugins by detecting the build output directory of
cmake. This requires a "CMakeCache.txt" file to be present in the parent
directory (above run/).
Change-Id: I297432cdcd0981646058410f3eadf5f73b5248c8
Reviewed-on: https://code.wireshark.org/review/7453
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'README.cmake')
| -rw-r--r-- | README.cmake | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/README.cmake b/README.cmake index 275ef4dd7e..5d798f5697 100644 --- a/README.cmake +++ b/README.cmake @@ -174,33 +174,6 @@ What needs to be done? appropriately for OS X. We currently use NSIS for the Windows installer but should probably use WiX instead. - Add support for cmake configurations. -- Automatically figure out if *shark is running from the build directory - (making WIRESHARK_RUN_FROM_BUILD_DIRECTORY unnecessary like it is with - autofoo). - Sadly: - - $ file run/qtshark - run/qtshark: Mach-O 64-bit x86_64 executable - - so what you're running from the build directory is the executable - itself. autofoo includes libtool in our case, so what you're running - from the build directory is a script that then runs the executable, - and the executable is in a .libs directory; the code that checks for - "running from the build directory?" checks for that. The actual - executable isn't supposed to be run directly - it's expected to be run - by the wrapper script and might not even work if run directly, as it - won't find the relevant shared libraries. - - We could perhaps check for the executable being in a "run" directory - instead, if the build drops it there. However, it's possible, at - least on OS X, to copy the executable to another directory and have - it run, so the guarantee that it's in a "run" directory is not as - strong. -- Get plugins loading when running *shark from the build directory. - That might involve handling ".libs" and "run" differently. The chance - that a random directory the executable was ultimately placed in would - be named "run" might also be a bit bigger than the chance that it's - named ".libs". - Get cross-compilation working (or ensure it does). It works with autofoo--and people use it. - Handle -DFORTIFY_SOURCE=2 appropriately. (Do a Web search for |