<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[171598] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/171598">171598</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-25 09:18:17 -0700 (Fri, 25 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] CMake tries to install JavaScriptCore-3.0.gir outside of install prefix
https://bugs.webkit.org/show_bug.cgi?id=135288
Patch by Michael Catanzaro <mcatanzaro@igalia.com> on 2014-07-25
Reviewed by Martin Robinson.
* Source/cmake/FindGObjectIntrospection.cmake: pass correct libdir and
datadir to pkgconfig
* Source/cmake/OptionsGTK.cmake: define install directories early
enough to be used in FindGObjectIntrospection.cmake</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeFindGObjectIntrospectioncmake">trunk/Source/cmake/FindGObjectIntrospection.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (171597 => 171598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-07-25 15:33:58 UTC (rev 171597)
+++ trunk/ChangeLog 2014-07-25 16:18:17 UTC (rev 171598)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-25 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] CMake tries to install JavaScriptCore-3.0.gir outside of install prefix
+ https://bugs.webkit.org/show_bug.cgi?id=135288
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/FindGObjectIntrospection.cmake: pass correct libdir and
+ datadir to pkgconfig
+ * Source/cmake/OptionsGTK.cmake: define install directories early
+ enough to be used in FindGObjectIntrospection.cmake
+
</ins><span class="cx"> 2014-07-23 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> Remove CSS_EXCLUSIONS compile flag and leftover code
</span></span></pre></div>
<a id="trunkSourcecmakeFindGObjectIntrospectioncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindGObjectIntrospection.cmake (171597 => 171598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGObjectIntrospection.cmake 2014-07-25 15:33:58 UTC (rev 171597)
+++ trunk/Source/cmake/FindGObjectIntrospection.cmake 2014-07-25 16:18:17 UTC (rev 171598)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> # INTROSPECTION_LIBS
</span><span class="cx"> #
</span><span class="cx"> # Copyright (C) 2010, Pino Toscano, <pino@kde.org>
</span><ins>+# Copyright (C) 2014 Igalia S.L.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use is allowed according to the terms of the BSD license.
</span><span class="cx">
</span><span class="lines">@@ -43,8 +44,8 @@
</span><span class="cx"> _gir_get_pkgconfig_var(INTROSPECTION_GENERATE "g_ir_generate" "")
</span><span class="cx"> _gir_get_pkgconfig_var(INTROSPECTION_GIRDIR "girdir" "")
</span><span class="cx"> _gir_get_pkgconfig_var(INTROSPECTION_TYPELIBDIR "typelibdir" "")
</span><del>- _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_GIRDIR "girdir" "--define-variable=prefix=${CMAKE_INSTALL_PREFIX}")
- _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_TYPELIBDIR "typelibdir" "--define-variable=prefix=${CMAKE_INSTALL_PREFIX}")
</del><ins>+ _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_GIRDIR "girdir" "--define-variable=datadir=${DATA_INSTALL_DIR}")
+ _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_TYPELIBDIR "typelibdir" "--define-variable=libdir=${LIB_INSTALL_DIR}")
</ins><span class="cx"> set(INTROSPECTION_CFLAGS "${_pc_gir_CFLAGS}")
</span><span class="cx"> set(INTROSPECTION_LIBS "${_pc_gir_LIBS}")
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (171597 => 171598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-07-25 15:33:58 UTC (rev 171597)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-07-25 16:18:17 UTC (rev 171598)
</span><span class="lines">@@ -16,6 +16,16 @@
</span><span class="cx"> set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
</span><span class="cx"> set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
</span><span class="cx">
</span><ins>+# These are shared variables, but we special case their definition so that we can use the
+# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
+set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
+set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}" CACHE PATH "Absolute path to install executables executed by the library")
+
+set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
+set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
+set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
+
</ins><span class="cx"> find_package(Cairo 1.10.2 REQUIRED)
</span><span class="cx"> find_package(Fontconfig 2.8.0 REQUIRED)
</span><span class="cx"> find_package(Freetype2 2.4.2 REQUIRED)
</span><span class="lines">@@ -173,16 +183,6 @@
</span><span class="cx"> set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
</span><span class="cx"> set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
</span><span class="cx">
</span><del>-# These are shared variables, but we special case their definition so that we can use the
-# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
-set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
-set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}" CACHE PATH "Absolute path to install executables executed by the library")
-
-set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
-set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
-set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
-
</del><span class="cx"> add_definitions(-DBUILDING_GTK__=1)
</span><span class="cx"> add_definitions(-DGETTEXT_PACKAGE="WebKit2GTK-${WEBKITGTK_API_VERSION}")
</span><span class="cx"> add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
</span></span></pre>
</div>
</div>
</body>
</html>