diff options
| author | Tomasz Moń <desowin@gmail.com> | 2019-09-03 20:28:52 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal@wireshark.org> | 2019-09-28 10:24:34 +0000 |
| commit | 990e409273b49650be5b89aaad75dba5a63460e2 (patch) | |
| tree | e67a532e7dac8effe7294ddb3f1314baf063c5d5 /CMakeLists.txt | |
| parent | ae750dc141e1658cf87a42eef37e4c755f56a133 (diff) | |
CMake: Use glib debug dlls in Windows debug builds
This prevents the mix of debug/release Universal CRT library in a Wireshark.
Bug: 16030
Change-Id: I2961541824caf3bef0a08c72b242427b5406a9bd
Reviewed-on: https://code.wireshark.org/review/34444
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a9cb87c4f4..f30336c6f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ # if(WIN32) - # Needed for GREATER_EQUAL operator - cmake_minimum_required(VERSION 3.7) + # Needed for add_custom_command() WORKING_DIRECTORY generator expressions + cmake_minimum_required(VERSION 3.13) else() cmake_minimum_required(VERSION 3.5) endif() @@ -1797,10 +1797,11 @@ if(WIN32) # Required DLLs and their corresponding PDBs. add_custom_command(TARGET copy_cli_dlls PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${GLIB2_DLLS} - ${GLIB2_PDBS} + "$<IF:$<CONFIG:Debug>,${GLIB2_DLLS_DEBUG},${GLIB2_DLLS_RELEASE}>" + "$<IF:$<CONFIG:Debug>,${GLIB2_PDBS_DEBUG},${GLIB2_PDBS_RELEASE}>" "${_dll_output_dir}" - WORKING_DIRECTORY "${GLIB2_DLL_DIR}" + WORKING_DIRECTORY $<IF:$<CONFIG:Debug>,${GLIB2_DLL_DIR_DEBUG},${GLIB2_DLL_DIR_RELEASE}> + COMMAND_EXPAND_LISTS ) # Optional DLLs and PDBs. |