1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Move the search for libgcc_s to GLib.

Browse Source 
Move the search for the libgcc_s_seh and _sjlj DLLs to the GLib directory.
That's the only place it currently exists on the 64-bit builder.

Change-Id: Icf55dacf061d9423e78cabeaf16aa539ccb619bb
Reviewed-on: https://code.wireshark.org/review/20162
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2017-02-17 12:20:58 -08:00
parent 560a6c3823
commit b59c87f94a
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/FindGCRYPT.cmake
View File

@ -51,7 +51,7 @@ IF(GCRYPT_FOUND)
CACHE PATH "Path to the Libgcrypt DLLs"
)
file( GLOB _gcrypt_dlls RELATIVE "${GCRYPT_DLL_DIR}"
"${GCRYPT_DLL_DIR}/libgcc_s_*.dll"
#"${GCRYPT_DLL_DIR}/libgcc_s_*.dll"
"${GCRYPT_DLL_DIR}/libgcrypt-*.dll"
"${GCRYPT_DLL_DIR}/libgpg-error*.dll"
)

1
cmake/modules/FindGLIB2.cmake
View File

@ -106,6 +106,7 @@ if( GLIB2_FOUND )
"${GLIB2_DLL_DIR}/libgmodule-*.dll"
"${GLIB2_DLL_DIR}/libgobject-*.dll"
"${GLIB2_DLL_DIR}/libintl-*.dll"
"${GLIB2_DLL_DIR}/libgcc_s_*.dll"
)
set ( GLIB2_DLLS ${_glib2_dlls}
# We're storing filenames only. Should we use STRING instead?

2
cmake/modules/FindGNUTLS.cmake
View File

@ -74,7 +74,7 @@ IF(GNUTLS_FOUND)
)
file( GLOB _gnutls_dlls RELATIVE "${GNUTLS_DLL_DIR}"
"${GNUTLS_DLL_DIR}/libgmp-*.dll"
"${GNUTLS_DLL_DIR}/libgcc_s_*.dll"
#"${GNUTLS_DLL_DIR}/libgcc_s_*.dll"
"${GNUTLS_DLL_DIR}/libffi-*.dll"
"${GNUTLS_DLL_DIR}/libgnutls-*.dll"
"${GNUTLS_DLL_DIR}/libhogweed-*.dll"