diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-04 15:56:15 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-04 23:57:04 +0000 |
| commit | a2e48c64e7be2f60fe171bbaf50b78a1f2352f63 (patch) | |
| tree | 63592efa9fff85a935faa33f44162638d2b0b49d | |
| parent | 86d24b0486014136137c98e2bb9d1651d01c8606 (diff) | |
On OS X, temporarily use cp to install some files.
The 32-bit OS X build is failing rather often due to cmake -E
copy_if_different failing to copy wireshark.html, and to call cmake's
copy functions completely crappy at reporting errors is to insult
software that's merely completely crappy at reporting errors. Try using
cp in the hopes that it'll actually tell us *WHY* the copy is failing
and see if we can fix it.
Change-Id: I723150c52c2ec0fe704d54191ef27fb6caf47fba
Reviewed-on: https://code.wireshark.org/review/6960
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e014d27785..b15bf9357b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1333,12 +1333,21 @@ endif() foreach(_install_file ${INSTALL_FILES}) get_filename_component(_install_basename "${_install_file}" NAME) +if (APPLE) + add_custom_command(TARGET copy_data_files POST_BUILD + COMMAND cp + "${_install_file}" + "${DATAFILE_DIR}/${_install_basename}" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) +else() add_custom_command(TARGET copy_data_files POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_install_file}" "${DATAFILE_DIR}/${_install_basename}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) +endif() endforeach() if(ENABLE_EXTCAP) |