From b59c87f94a0752efcf4a90b3f8c61a08bcddde8f Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 17 Feb 2017 12:20:58 -0800 Subject: 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 --- cmake/modules/FindGLIB2.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'cmake/modules/FindGLIB2.cmake') 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? -- cgit v1.2.3