From f3de00fc36eb86f4485352db4dc98030bf896eb4 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 23 Jul 2018 13:47:35 -0700 Subject: CMake: Fixup some documentation dependencies. Change the dependencies of various wsug targets to update_tools_help instead of the files it generates. Have the nsis_package_prep and wix_package_prep targets depend on user_guide_chm instead of update_tools_help. This should make parallel builds of all_guides, wix_package_prep and possibly other targets more reliable. Change-Id: I473f0e608aade1ac0053c03bef0942c69c650f65 Reviewed-on: https://code.wireshark.org/review/28838 Petri-Dish: Gerald Combs Reviewed-by: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- packaging/nsis/CMakeLists.txt | 2 -- packaging/wix/CMakeLists.txt | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'packaging') diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 4da3a9a31f..52d64efa4d 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -186,9 +186,7 @@ macro( ADD_NSIS_PACKAGE_TARGET ) DEPENDS ${NSIS_FILES} copy_data_files - update_tools_help user_guide_chm - ${CMAKE_BINARY_DIR}/docbook/user-guide.chm ${DATAFILE_DIR}/uninstall.exe ) set_target_properties(nsis_package_prep PROPERTIES FOLDER "Packaging") diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index e571ad6158..e9297848d8 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -271,9 +271,7 @@ macro( ADD_WIX_PACKAGE_TARGET ) DEPENDS ${WIX_FILES} copy_data_files - update_tools_help - user_guides - ${CMAKE_BINARY_DIR}/docbook/user-guide.chm + user_guide_chm ) set_target_properties(wix_package_prep PROPERTIES FOLDER "Packaging") -- cgit v1.2.3