<!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>[215221] 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/215221">215221</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2017-04-11 01:29:43 -0700 (Tue, 11 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] OpenWebRTC libraries path isn't properly deduced
https://bugs.webkit.org/show_bug.cgi?id=170670
Reviewed by Carlos Garcia Campos.
When using OpenWebRTC installation that's outside of the usual Jhbuild
installation directories, the library paths are ignored because the
dependency libraries are simply gathered from the pkg-config file.
Instead, the pkg-config data should be used to search for the correct
paths to the header and library locations. Both libopenwebrtc and
libopenwebrtc_gst libraries are needed, so the two library paths are
concatenated into the OPENWEBRTC_LIBRARIES variable.
* Source/cmake/FindOpenWebRTC.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeFindOpenWebRTCcmake">trunk/Source/cmake/FindOpenWebRTC.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (215220 => 215221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2017-04-11 08:27:28 UTC (rev 215220)
+++ trunk/ChangeLog 2017-04-11 08:29:43 UTC (rev 215221)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-04-11 Zan Dobersek <zdobersek@igalia.com>
+
+ [CMake] OpenWebRTC libraries path isn't properly deduced
+ https://bugs.webkit.org/show_bug.cgi?id=170670
+
+ Reviewed by Carlos Garcia Campos.
+
+ When using OpenWebRTC installation that's outside of the usual Jhbuild
+ installation directories, the library paths are ignored because the
+ dependency libraries are simply gathered from the pkg-config file.
+
+ Instead, the pkg-config data should be used to search for the correct
+ paths to the header and library locations. Both libopenwebrtc and
+ libopenwebrtc_gst libraries are needed, so the two library paths are
+ concatenated into the OPENWEBRTC_LIBRARIES variable.
+
+ * Source/cmake/FindOpenWebRTC.cmake:
+
</ins><span class="cx"> 2017-04-08 Ting-Wei Lan <lantw44@gmail.com>
</span><span class="cx">
</span><span class="cx"> Elftoolchain ar doesn't support response files
</span></span></pre></div>
<a id="trunkSourcecmakeFindOpenWebRTCcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindOpenWebRTC.cmake (215220 => 215221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindOpenWebRTC.cmake 2017-04-11 08:27:28 UTC (rev 215220)
+++ trunk/Source/cmake/FindOpenWebRTC.cmake 2017-04-11 08:29:43 UTC (rev 215221)
</span><span class="lines">@@ -30,20 +30,41 @@
</span><span class="cx"> # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> find_package(PkgConfig)
</span><del>-pkg_check_modules(OPENWEBRTC openwebrtc-0.3 openwebrtc-gst-0.3)
</del><ins>+pkg_check_modules(PC_OPENWEBRTC openwebrtc-0.3 openwebrtc-gst-0.3)
</ins><span class="cx">
</span><span class="cx"> set(VERSION_OK TRUE)
</span><del>-if (OPENWEBRTC_VERSION)
</del><ins>+if (PC_OPENWEBRTC_VERSION)
</ins><span class="cx"> if (OPENWEBRTC_FIND_VERSION_EXACT)
</span><del>- if (NOT("${OPENWEBRTC_FIND_VERSION}" VERSION_EQUAL "${OPENWEBRTC_VERSION}"))
</del><ins>+ if (NOT("${OPENWEBRTC_FIND_VERSION}" VERSION_EQUAL "${PC_OPENWEBRTC_VERSION}"))
</ins><span class="cx"> set(VERSION_OK FALSE)
</span><span class="cx"> endif ()
</span><span class="cx"> else ()
</span><del>- if ("${OPENWEBRTC_VERSION}" VERSION_LESS "${OPENWEBRTC_FIND_VERSION}")
</del><ins>+ if ("${OPENWEBRTC_VERSION}" VERSION_LESS "${PC_OPENWEBRTC_FIND_VERSION}")
</ins><span class="cx"> set(VERSION_OK FALSE)
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+find_path(OPENWEBRTC_INCLUDE_DIRS
+ NAMES owr/owr.h
+ HINTS ${PC_OPENWEBRTC_INCLUDEDIR} ${PC_OPENWEBRTC_INCLUDE_DIRS}
+)
+
+find_library(OPENWEBRTC_LIBRARY
+ NAMES openwebrtc
+ HINTS ${PC_OPENWEBRTC_LIBDIR} ${PC_OPENWEBRTC_LIBRARY_DIRS}
+)
+find_library(OPENWEBRTC_GST_LIBRARY
+ NAMES openwebrtc_gst
+ HINTS ${PC_OPENWEBRTC_LIBDIR} ${PC_OPENWEBRTC_LIBRARY_DIRS}
+)
+
+set(OPENWEBRTC_LIBRARIES
+ ${OPENWEBRTC_LIBRARY}
+ ${OPENWEBRTC_GST_LIBRARY}
+)
+
+mark_as_advanced(OPENWEBRTC_INCLUDE_DIRS OPENWEBRTC_LIBRARIES)
+
</ins><span class="cx"> include(FindPackageHandleStandardArgs)
</span><span class="cx"> FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENWEBRTC DEFAULT_MSG OPENWEBRTC_INCLUDE_DIRS OPENWEBRTC_LIBRARIES VERSION_OK)
</span></span></pre>
</div>
</div>
</body>
</html>