From 940e0079539e0d80c21b627caa6f83968629d02b Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 29 Aug 2009 12:26:40 -0700 Subject: Fixed CMake not finding GLib on windows --- ChangeLog.txt | 6 ++++++ linden/indra/cmake/GStreamer.cmake | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7bb037f..ff2ac63 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -5,6 +5,12 @@ modified: linden/indra/cmake/OPENAL.cmake + * Fixed CMake not finding GLib on windows. + + modified: linden/indra/cmake/GStreamer.cmake + + + 2009-06-14 McCabe Maxsted * Added IM preference for showing IMs in either main or local chat. diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index 880233e..29896d0 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake @@ -11,6 +11,7 @@ if (WINDOWS) use_prebuilt_binary(libxml) use_prebuilt_binary(iconv) + use_prebuilt_binary(glib) use_prebuilt_binary(gstreamer-plugins) set(GSTREAMER_FOUND ON FORCE BOOL) set(GSTREAMER_INCLUDE_DIRS -- cgit v1.1