aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/modules/FindGLIB2.cmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-02-17 12:20:58 -0800
committerGerald Combs <gerald@wireshark.org>2017-02-17 20:27:03 +0000
commitb59c87f94a0752efcf4a90b3f8c61a08bcddde8f (patch)
treed69ee98f139fdf1fd23fbcdc7ef0a7062105435c /cmake/modules/FindGLIB2.cmake
parent560a6c3823cf560b883e29db0a403517def86639 (diff)
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/modules/FindGLIB2.cmake')
-rw-r--r--cmake/modules/FindGLIB2.cmake1
1 files changed, 1 insertions, 0 deletions
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?