diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-02-17 12:20:58 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-02-17 20:27:03 +0000 |
| commit | b59c87f94a0752efcf4a90b3f8c61a08bcddde8f (patch) | |
| tree | d69ee98f139fdf1fd23fbcdc7ef0a7062105435c /cmake | |
| parent | 560a6c3823cf560b883e29db0a403517def86639 (diff) | |
| download | wireshark-b59c87f94a0752efcf4a90b3f8c61a08bcddde8f.tar.gz | |
CMake: Move the search for libgcc_s to GLib.
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGCRYPT.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindGLIB2.cmake | 1 | ||||
| -rw-r--r-- | cmake/modules/FindGNUTLS.cmake | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cmake/modules/FindGCRYPT.cmake b/cmake/modules/FindGCRYPT.cmake index 6b6f2dcc3a..664da87174 100644 --- a/cmake/modules/FindGCRYPT.cmake +++ b/cmake/modules/FindGCRYPT.cmake @@ -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" ) diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake index ab13acf572..c1a62da542 100644 --- a/cmake/modules/FindGLIB2.cmake +++ b/cmake/modules/FindGLIB2.cmake @@ -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? diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake index dd1042ae37..19e7eb4afc 100644 --- a/cmake/modules/FindGNUTLS.cmake +++ b/cmake/modules/FindGNUTLS.cmake @@ -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" |