diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-01-12 15:46:38 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-01-13 00:47:48 +0000 |
| commit | 777932efc61a62d6ad56ecd620a76972e438478a (patch) | |
| tree | 00ab98c3f405aca7083975d4de7766945165d9bf | |
| parent | 554d3c9cd206827d066bc65010907750fdd01199 (diff) | |
make-dissectors depends on copy_cli_dlls.
Have the make-dissectors CMake target explicitly depend on copy_cli_dlls,
otherwise we might try to create dissectors.c before libglib-2.0-0.dll
has been copied into place. It looks like this is what's been causing
our random Windows PD failures.
Change-Id: Ia2445f17abd2c73113ab269ba6c606f48e724d93
Reviewed-on: https://code.wireshark.org/review/25292
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/dissectors/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b6100a9f6b..1f6bbd59ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1886,6 +1886,7 @@ if(WIN32) ) endif(WINSPARKLE_FOUND) + # This might not be needed since make-dissectors has the same dependency. add_dependencies(epan copy_cli_dlls) # We have a lot of choices for creating zip archives: diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt index 298f32f5f9..d67c227f11 100644 --- a/epan/dissectors/CMakeLists.txt +++ b/epan/dissectors/CMakeLists.txt @@ -1874,6 +1874,10 @@ add_executable(make-dissectors make-dissectors.c) # wsutil is only required for glib-compat.c target_link_libraries(make-dissectors ${GLIB2_LIBRARIES} wsutil) +if(WIN32) + add_dependencies(make-dissectors copy_cli_dlls) +endif() + # # We pass the arguments to make-dissectors in a file to avoid limitations # with the number of arguments handled by main(). |