diff --git a/cmake/FindGlib.cmake b/cmake/FindGlib.cmake
new file mode 100644
index 000000000..86427868f
--- /dev/null
+++ b/cmake/FindGlib.cmake
@@ -0,0 +1,43 @@
+# - Try to find Glib-2.0 (with gobject)
+# Once done, this will define
+#
+#  Glib_FOUND - system has Glib
+#  Glib_INCLUDE_DIRS - the Glib include directories
+#  Glib_LIBRARIES - link these to use Glib
+#
+#  GLIB_ROOT_DIR - Primary search directory
+include(LibFindMacros)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(Glib_PKGCONF glib-2.0)
+
+# Main include dir
+find_path(Glib_INCLUDE_DIR
+		  NAMES glib.h
+		  PATHS $ {Glib_PKGCONF_INCLUDE_DIRS} $ {GLIB_ROOT_DIR}
+		  PATH_SUFFIXES glib-2.0
+		 )
+
+# Finally the library itself
+find_library(Glib_LIBRARY
+			 NAMES glib-2.0 gstreamer_android
+			 PATHS $ {Glib_PKGCONF_LIBRARY_DIRS} $ {GLIB_ROOT_DIR}
+			)
+find_library(Gobject_LIBRARY
+			 NAMES gobject-2.0 gstreamer_android
+			 PATHS $ {Glib_PKGCONF_LIBRARY_DIRS} $ {GLIB_ROOT_DIR}
+			)
+
+# Glib-related libraries also use a separate config header, which is in lib dir
+find_path(GlibConfig_INCLUDE_DIR
+		  NAMES glibconfig.h
+		  PATHS $ {Glib_PKGCONF_INCLUDE_DIRS} /usr $ {GLIB_ROOT_DIR}
+		  PATH_SUFFIXES lib/glib-2.0/include glib-2.0/include
+		 )
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(Glib_PROCESS_INCLUDES Glib_INCLUDE_DIR GlibConfig_INCLUDE_DIR)
+set(Glib_PROCESS_LIBS Glib_LIBRARY Gobject_LIBRARY)
+libfind_process(Glib)
+
diff --git a/cmake/LibFindMacros.cmake b/cmake/LibFindMacros.cmake
new file mode 100644
index 000000000..0e47404c5
--- /dev/null
+++ b/cmake/LibFindMacros.cmake
@@ -0,0 +1,116 @@
+# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
+# used for the current package. For this to work, the first parameter must be the
+# prefix of the current package, then the prefix of the new package etc, which are
+# passed to find_package.
+macro(libfind_package PREFIX)
+	set(LIBFIND_PACKAGE_ARGS $ {ARGN})
+	if($ {PREFIX} _FIND_QUIETLY)
+		set(LIBFIND_PACKAGE_ARGS $ {LIBFIND_PACKAGE_ARGS} QUIET)
+	endif($ {PREFIX} _FIND_QUIETLY)
+	if($ {PREFIX} _FIND_REQUIRED)
+		set(LIBFIND_PACKAGE_ARGS $ {LIBFIND_PACKAGE_ARGS} REQUIRED)
+	endif($ {PREFIX} _FIND_REQUIRED)
+	find_package($ {LIBFIND_PACKAGE_ARGS})
+endmacro(libfind_package)
+
+# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
+# where they added pkg_check_modules. Consequently I need to support both in my scripts
+# to avoid those deprecated warnings. Here's a helper that does just that.
+# Works identically to pkg_check_modules, except that no checks are needed prior to use.
+macro (libfind_pkg_check_modules PREFIX PKGNAME)
+	if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+		include(UsePkgConfig)
+		pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
+	else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+		find_package(PkgConfig)
+		if (PKG_CONFIG_FOUND)
+			pkg_check_modules(${PREFIX} ${PKGNAME})
+		endif (PKG_CONFIG_FOUND)
+	endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+endmacro (libfind_pkg_check_modules)
+
+# Do the final processing once the paths have been detected.
+# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
+# all the variables, each of which contain one include directory.
+# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
+# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
+# Also handles errors in case library detection was required, etc.
+macro (libfind_process PREFIX)
+# Skip processing if already processed during this run
+	if (NOT ${PREFIX}_FOUND)
+# Start with the assumption that the library was found
+		set (${PREFIX}_FOUND TRUE)
+
+# Process all includes and set _FOUND to false if any are missing
+		foreach (i ${${PREFIX}_PROCESS_INCLUDES})
+			if (${i})
+				set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
+				mark_as_advanced(${i})
+			else (${i})
+				set (${PREFIX}_FOUND FALSE)
+			endif (${i})
+		endforeach (i)
+
+# Process all libraries and set _FOUND to false if any are missing
+		foreach (i ${${PREFIX}_PROCESS_LIBS})
+			if (${i})
+				set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
+				mark_as_advanced(${i})
+			else (${i})
+				set (${PREFIX}_FOUND FALSE)
+			endif (${i})
+		endforeach (i)
+
+# Print message and/or exit on fatal error
+		if (${PREFIX}_FOUND)
+			if (NOT ${PREFIX}_FIND_QUIETLY)
+				message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
+			endif (NOT ${PREFIX}_FIND_QUIETLY)
+		else (${PREFIX}_FOUND)
+			if (${PREFIX}_FIND_REQUIRED)
+				foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
+					message("${i}=${${i}}")
+				endforeach (i)
+				message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
+			endif (${PREFIX}_FIND_REQUIRED)
+		endif (${PREFIX}_FOUND)
+	endif (NOT ${PREFIX}_FOUND)
+endmacro (libfind_process)
+
+macro(libfind_library PREFIX basename)
+	set(TMP "")
+	if(MSVC80)
+		set(TMP -vc80)
+	endif(MSVC80)
+	if(MSVC90)
+		set(TMP -vc90)
+	endif(MSVC90)
+	set(${PREFIX}_LIBNAMES ${basename}${TMP})
+	if(${ARGC} GREATER 2)
+		set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
+		string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
+		set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
+	endif(${ARGC} GREATER 2)
+	find_library(${PREFIX}_LIBRARY
+		NAMES ${${PREFIX}_LIBNAMES}
+		PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
+endmacro(libfind_library)
+
+SET(THREE_PART_VERSION_REGEX "[0-9]+\\.[0-9]+\\.[0-9]+")
+# Breaks up a string in the form n1.n2.n3 into three parts and stores
+# them in major, minor, and patch.	version should be a value, not a
+# variable, while major, minor and patch should be variables.
+MACRO(THREE_PART_VERSION_TO_VARS version major minor patch)
+	IF(${version} MATCHES ${THREE_PART_VERSION_REGEX})
+		STRING(REPLACE "." " " version_list ${version})
+		SEPARATE_ARGUMENTS(version_list)
+		LIST(GET version_list 0 ${major})
+		LIST(GET version_list 1 ${minor})
+		LIST(GET version_list 2 ${patch})
+	ELSE(${version} MATCHES ${THREE_PART_VERSION_REGEX})
+		MESSAGE("MACRO(THREE_PART_VERSION_TO_VARS ${version} ${major} ${minor} ${patch}")
+		MESSAGE(FATAL_ERROR "Problem parsing version string, I can't parse it properly.")
+	ENDIF(${version} MATCHES ${THREE_PART_VERSION_REGEX})
+ENDMACRO(THREE_PART_VERSION_TO_VARS)
+
+