Bug 132530 – Allow CMake to find GLib on FreeBSD

• Component: New Bugs
• Status: RESOLVED FIXED

[Myles C. Maxfield]

Allow CMake to find GLib on FreeBSD

[Myles C. Maxfield]

Created attachment 230764 [details]
Patch

[Raphael Kubo da Costa (:rakuco)]

My local version looks like this instead. It achieves the same thing while being a bit more generic.

Index: Source/cmake/FindGLIB.cmake
===================================================================
--- Source/cmake/FindGLIB.cmake	(revision 166850)
+++ Source/cmake/FindGLIB.cmake	(working copy)
@@ -56,6 +56,7 @@
 find_path(GLIBCONFIG_INCLUDE_DIR
     NAMES glibconfig.h
     HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${_GLIB_LIBRARY_DIR}
+          ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS}
     PATH_SUFFIXES glib-2.0/include
 )

I have mixed feelings about this since it's FreeBSD that shouldn't be patching glib to install glibconfig.h into a different location, but I guess the cat is already out of the bag at this point.

[Myles C. Maxfield]

Created attachment 231608 [details]
Patch

[Gustavo Noronha (kov)]

Comment on attachment 231608 [details]
Patch

… yeah, but that should not cause any issues

[WebKit Commit Bot]

Comment on attachment 231608 [details]
Patch

Clearing flags on attachment: 231608

Committed r171962: <http://trac.webkit.org/changeset/171962>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.