diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-15 16:23:56 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-15 23:24:59 +0000 |
| commit | b845785a73e4d2224da6b2e1ca7be7a76de07352 (patch) | |
| tree | c843f1ff96539a1213c55cd1c78c4c95339f61dd /CMakeLists.txt | |
| parent | 973b2884c64ebf9b82ca4a828faad7775b4eaba6 (diff) | |
| download | wireshark-b845785a73e4d2224da6b2e1ca7be7a76de07352.tar.gz wireshark-b845785a73e4d2224da6b2e1ca7be7a76de07352.tar.bz2 wireshark-b845785a73e4d2224da6b2e1ca7be7a76de07352.zip | |
CMake: Try not to clobber our gspawn exes.
Try not to overwrite gspawn*.exe between signing them and packaging
them. (Second try.)
Change-Id: I717f5fca6dc6afbc146927d06e6f74ae6a0a87c8
Reviewed-on: https://code.wireshark.org/review/8082
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cd3a360079..16b1de9975 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1271,14 +1271,16 @@ if(WIN32) endforeach(_dll) + # Don't overwrite an exe if it's already there. We don't want to + # clobber any previous code signing. file(GLOB _gspawn_helpers + RELATIVE "${GLIB2_DLL_DIR}" "${GLIB2_DLL_DIR}/gspawn*.exe" ) foreach(_gspawn_helper ${_gspawn_helpers}) add_custom_command(TARGET copy_cli_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${_gspawn_helper}" - "${_dll_output_dir}" + COMMAND if not exist \"${_dll_output_dir_win}\\${_gspawn_helper}\" xcopy ${_gspawn_helper} "${_dll_output_dir_win}" /D /Y + WORKING_DIRECTORY "${GLIB2_DLL_DIR}" ) endforeach() |