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 /cmake/modules/FindGLIB2.cmake | |
| 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 'cmake/modules/FindGLIB2.cmake')
| -rw-r--r-- | cmake/modules/FindGLIB2.cmake | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake index 79e8abd29a..6b3876b528 100644 --- a/cmake/modules/FindGLIB2.cmake +++ b/cmake/modules/FindGLIB2.cmake @@ -142,11 +142,6 @@ if( GLIB2_FOUND ) # "${GLIB2_DLL_DIR_RELEASE}/libffi.dll" "${GLIB2_DLL_DIR_RELEASE}/iconv-2.dll" "${GLIB2_DLL_DIR_RELEASE}/intl-8.dll" - "${GLIB2_DLL_DIR_RELEASE}/pcre.dll" - # "${GLIB2_DLL_DIR_RELEASE}/pcre16.dll" - # "${GLIB2_DLL_DIR_RELEASE}/pcre32.dll" - # "${GLIB2_DLL_DIR_RELEASE}/pcrecpp.dll" - # "${GLIB2_DLL_DIR_RELEASE}/pcreposix.dll" ) set ( GLIB2_DLLS_RELEASE ${_glib2_dlls_release} # We're storing filenames only. Should we use STRING instead? @@ -163,11 +158,6 @@ if( GLIB2_FOUND ) # "${GLIB2_DLL_DIR_DEBUG}/libffi.dll" "${GLIB2_DLL_DIR_DEBUG}/iconv-2.dll" "${GLIB2_DLL_DIR_DEBUG}/intl-8.dll" - "${GLIB2_DLL_DIR_DEBUG}/pcred.dll" - # "${GLIB2_DLL_DIR_DEBUG}/pcre16d.dll" - # "${GLIB2_DLL_DIR_DEBUG}/pcre32d.dll" - # "${GLIB2_DLL_DIR_DEBUG}/pcrecppd.dll" - # "${GLIB2_DLL_DIR_DEBUG}/pcreposixd.dll" ) set ( GLIB2_DLLS_DEBUG ${_glib2_dlls_debug} # We're storing filenames only. Should we use STRING instead? @@ -181,7 +171,6 @@ if( GLIB2_FOUND ) # "${GLIB2_DLL_DIR_RELEASE}/libcharset.pdb" # "${GLIB2_DLL_DIR_RELEASE}/libiconv.pdb" # "${GLIB2_DLL_DIR_RELEASE}/libintl.pdb" - "${GLIB2_DLL_DIR_RELEASE}/pcre.pdb" ) set ( GLIB2_PDBS_RELEASE ${_glib2_pdbs_release} CACHE FILEPATH "GLib2 debug release PDB list" @@ -193,7 +182,6 @@ if( GLIB2_FOUND ) # "${GLIB2_DLL_DIR_DEBUG}/libcharset.pdb" # "${GLIB2_DLL_DIR_DEBUG}/libiconv.pdb" # "${GLIB2_DLL_DIR_DEBUG}/libintl.pdb" - "${GLIB2_DLL_DIR_DEBUG}/pcre.pdb" ) set ( GLIB2_PDBS_DEBUG ${_glib2_pdbs_debug} CACHE FILEPATH "GLib2 debug debug PDB list" |