Wireshark-commits: [Wireshark-commits] master 12b2e3d: cmake: fix dependencies for copy_data_files
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=12b2e3d4e211aa10fe8b2cb42847869f3378fd39
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
12b2e3d by Peter Wu (peter@xxxxxxxxxxxxx):
cmake: fix dependencies for copy_data_files
Ensure that files from INSTALL_FILES depend on html_docs, not the parent
target copy_data_files (that would not help at all). Ensure that lua
scripts are generated before copying them (another moved dependency).
Explicitly track the help files that have to be textified for Windows
(this finalizes the addition of proper dependencies to copy_data_files
targets).
Since there is no compelling reason for the extra
copy_data_files_depends target now, remove it and move copy_data_files a
bit further in the file such that the dependencies can be set.
While at it, remove the unnecessary make_directory, the copy_data_files
target will create it automatically when copying a file into it.
Should fix the problem reported at https://code.wireshark.org/review/12028
Change-Id: I81e56c93ac0fc85e7385605b9c780a80b3d43c85
Reviewed-on: https://code.wireshark.org/review/12130
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 6181045 Don't check whether the C++ compiler supports a flag if there isn't one.
adds 12b2e3d cmake: fix dependencies for copy_data_files
Summary of changes:
CMakeLists.txt | 44 +++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 23 deletions(-)