Wireshark-commits: [Wireshark-commits] master 107205c: wsutil: get_datafile_dir: avoid hard-coded b
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=107205c2becb5a16b214cdbc471833fdfee077ab
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
107205c by Peter Wu (peter@xxxxxxxxxxxxx):
wsutil: get_datafile_dir: avoid hard-coded build directory
With autotools, it was possible that the binary was located in a .libs
directory, but with CMake the executables directory and data directory
are the same (except macOS with app bundles). Use this property to get
rid of the hard-coded build directory. Helps with reproducible builds.
Bug: 15163
Change-Id: I5b8807a03783a9919fba7b0cc83f5c162caa8052
Reviewed-on: https://code.wireshark.org/review/29984
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 105f2d6 You have to add setargv.obj as a link flag, not as a library.
add 107205c wsutil: get_datafile_dir: avoid hard-coded build directory
Summary of changes:
wsutil/CMakeLists.txt | 7 ------
wsutil/filesystem.c | 70 +++++++++++++++++++++++++--------------------------
2 files changed, 35 insertions(+), 42 deletions(-)