osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2018-01-12 15:46:38 -08:00
parent 554d3c9cd2
commit 777932efc6
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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:

4
epan/dissectors/CMakeLists.txt
View File

@ -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().