Wireshark-commits: [Wireshark-commits] master 11ba10d: Fix build paths for cmake's Xcode project ge
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=11ba10dd4b8865d1d4b866cd808ec8fe4defe3b2
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
11ba10d by David Kreitschmann (dkreitschmann@xxxxxxxxxxxxxxxxxxxxxx):
Fix build paths for cmake's Xcode project generator on macOS.
Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched.
One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging.
Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run.
Bug: 11816
Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9
Reviewed-on: https://code.wireshark.org/review/28291
Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 17604f1 CMake+macOS: Make sure we're using the right Qt tools.
adds 11ba10d Fix build paths for cmake's Xcode project generator on macOS.
Summary of changes:
CMakeLists.txt | 62 +++++++++++++++++++++++++------------
README.macos | 16 ++++++++++
cmake/modules/WiresharkPlugin.cmake | 9 ------
codecs/CMakeLists.txt | 10 ++++++
epan/CMakeLists.txt | 13 ++++++--
extcap/CMakeLists.txt | 27 ++++++++++------
wiretap/CMakeLists.txt | 13 ++++++--
wsutil/CMakeLists.txt | 14 +++++++--
8 files changed, 116 insertions(+), 48 deletions(-)
