diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-10-17 19:11:26 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2023-10-19 18:05:43 -0700 |
| commit | 800831cab2d20722b042e2847bff965f51714bad (patch) | |
| tree | dbc460c326b574efb6f746f0465a4f9fdaae810f /CMakeLists.txt | |
| parent | 652b6b186f4d334846e99666c31dea68d9073251 (diff) | |
Fixup vcpkg-export-20231017-1
GLib's debug libraries link against pcre2-8d.lib, which means we have
to as well.
Revert some debugging in GitLab CI.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index df1872586c..50d696e6e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2152,6 +2152,15 @@ if(USE_REPOSITORY) COMMAND_EXPAND_LISTS ) + add_custom_command(TARGET copy_cli_dlls PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "$<IF:$<CONFIG:Debug>,${PCRE2_DEBUG_DLL},${PCRE2_RELEASE_DLL}>" + "$<IF:$<CONFIG:Debug>,${PCRE2_DEBUG_PDB},${PCRE2_RELEASE_PDB}>" + "${_dll_output_dir}" + WORKING_DIRECTORY $<IF:$<CONFIG:Debug>,${PCRE2_DEBUG_DLL_DIR},${PCRE2_RELEASE_DLL_DIR}> + COMMAND_EXPAND_LISTS + ) + if (MSVC AND VLD_FOUND) add_custom_command(TARGET copy_cli_dlls PRE_BUILD COMMAND ${CMAKE_COMMAND} -E "$<IF:$<CONFIG:Debug>,copy_if_different,true>" @@ -2207,10 +2216,6 @@ if(USE_REPOSITORY) list (APPEND THIRD_PARTY_DLLS "${NGHTTP3_DLL_DIR}/${NGHTTP3_DLL}") list (APPEND THIRD_PARTY_PDBS "${NGHTTP3_DLL_DIR}/${NGHTTP3_PDB}") endif(NGHTTP3_FOUND) - if (PCRE2_FOUND) - list (APPEND THIRD_PARTY_DLLS "${PCRE2_DLL_DIR}/${PCRE2_DLL}") - list (APPEND THIRD_PARTY_PDBS "${PCRE2_DLL_DIR}/${PCRE2_PDB}") - endif(PCRE2_FOUND) if (SBC_FOUND) list (APPEND THIRD_PARTY_DLLS "${SBC_DLL_DIR}/${SBC_DLL}") endif(SBC_FOUND) |