diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-05 09:22:37 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-05 17:30:46 +0000 |
| commit | 410a8d1cab5b1745bd570e04503227224e15968e (patch) | |
| tree | 0bc341f17cd13a293a3cc738822f61751a254a7a | |
| parent | dff82e6034d001795f461ce93096d575ce565bd6 (diff) | |
| download | wireshark-410a8d1cab5b1745bd570e04503227224e15968e.tar.gz | |
CMake: Make copy_data_files depend on html_docs.
Semi-blind attempt to fix what appears to be a race condition on the OS
X x86 buildbot.
Change-Id: I379c7dec26c2bca092d0c9a49465ee56a01d15ec
Reviewed-on: https://code.wireshark.org/review/6969
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d42ae5bfe..74d8d41717 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1315,6 +1315,7 @@ endif(WIN32) # Copy ${INSTALL_FILES} and ${INSTALL_DIRS} to ${DATAFILE_DIR} add_custom_target(copy_data_files ALL DEPENDS ${INSTALL_FILES}) set_target_properties(copy_data_files PROPERTIES FOLDER "Copy Tasks") +add_dependencies(copy_data_files html_docs) if(ENABLE_APPLICATION_BUNDLE) add_custom_command(TARGET copy_data_files PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}" @@ -1335,7 +1336,7 @@ 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 ${CMAKE_COMMAND} -E copy + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_install_file}" "${DATAFILE_DIR}/${_install_basename}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} |