diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-13 10:31:00 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-13 17:49:19 +0000 |
| commit | f333e7ed671208f897ce11ceb603d44e4cebd499 (patch) | |
| tree | 1006a46a419b5323891da2ff212a08223d5f2806 | |
| parent | 3a220ed25d3f2bd0b3530d13ccbd38cb5a6aad59 (diff) | |
| download | wireshark-f333e7ed671208f897ce11ceb603d44e4cebd499.tar.gz | |
Add the OpenSUSE zlib1.dll when needed.
The Visual Studio solution files created by CMake list "Debug" as the
first configuration, which means that we end up with zlibd1.dll by
default. Many of the OpenSUSE DLLs depend on zlib1.dll. Add the OBS
version in that case.
Change-Id: Ia98490f1a192802d1482e0749bbd2b550e916bc5
Reviewed-on: https://code.wireshark.org/review/8051
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a40b8c6f87..d4782cdb17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1233,8 +1233,11 @@ if(WIN32) # XXX Can (and should) we iterate over these similar to the way # the top-level CMakeLists.txt iterates over the package list? - # Required - foreach( _dll ${GLIB2_DLLS} ) + # Required DLLs. + # The cairo, freetype, gio, gnutls, png, and other OBS-generated DLLs + # depend on zlib1.dll. We compile zlib locally but the Debug + # configuration (the default) creates zlibd1.dll. + foreach( _dll ${GLIB2_DLLS} $<$<CONFIG:Debug>:zlib1.dll> ) add_custom_command(TARGET copy_cli_dlls PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${GLIB2_DLL_DIR}/${_dll}" |