diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-15 23:22:26 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-15 23:22:34 +0000 |
| commit | 973b2884c64ebf9b82ca4a828faad7775b4eaba6 (patch) | |
| tree | 4cb52eba2a9f2dfba197de64c920942e75f5b66d /packaging | |
| parent | 8d9fdda9913a4773ebaf4fc34401ae8a24b729d7 (diff) | |
Revert "CMake: Try not to clobber our gspawn exes."
This accidentally reverted code from g40ce324. Will try again shortly.
This reverts commit 8d9fdda9913a4773ebaf4fc34401ae8a24b729d7.
Change-Id: I0bf7f351b926f1ce4b0c9e19fe0367add1dfee1e
Reviewed-on: https://code.wireshark.org/review/8081
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 5bb0ddcb59..e72432b145 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -221,9 +221,9 @@ macro( ADD_NSIS_PACKAGE_TARGET ) # the NMake environment for now. add_custom_command(OUTPUT ${_nsis_package} DEPENDS - # Note that we do NOT depend on any executables here - # so that we don't clobber any code signing attempts. ${NSIS_FILES} + ${PROGLIST} + plugins copy_data_files user_guides ${CMAKE_BINARY_DIR}/docbook/user-guide.chm |