osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2015-04-13 10:31:00 -07:00
parent 3a220ed25d
commit f333e7ed67
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -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}"