Bug 132530 - Allow CMake to find GLib on FreeBSD
Summary: Allow CMake to find GLib on FreeBSD
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Myles C. Maxfield
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-03 14:11 PDT by Myles C. Maxfield
Modified: 2014-08-01 17:46 PDT (History)
8 users (show)

See Also:


Attachments
Patch (1.22 KB, patch)
2014-05-03 14:15 PDT, Myles C. Maxfield
no flags Details | Formatted Diff | Diff
Patch (1.27 KB, patch)
2014-05-16 18:13 PDT, Myles C. Maxfield
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Myles C. Maxfield 2014-05-03 14:11:30 PDT
Allow CMake to find GLib on FreeBSD
Comment 1 Myles C. Maxfield 2014-05-03 14:15:15 PDT
Created attachment 230764 [details]
Patch
Comment 2 Raphael Kubo da Costa (:rakuco) 2014-05-03 15:10:08 PDT
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.
Comment 3 Myles C. Maxfield 2014-05-16 18:13:06 PDT
Created attachment 231608 [details]
Patch
Comment 4 Gustavo Noronha (kov) 2014-08-01 06:29:16 PDT
Comment on attachment 231608 [details]
Patch

… yeah, but that should not cause any issues
Comment 5 WebKit Commit Bot 2014-08-01 17:46:41 PDT
Comment on attachment 231608 [details]
Patch

Clearing flags on attachment: 231608

Committed r171962: <http://trac.webkit.org/changeset/171962>
Comment 6 WebKit Commit Bot 2014-08-01 17:46:46 PDT
All reviewed patches have been landed.  Closing bug.