[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-buildsystem
Subject: Re: Review Request 119901: Fix ECM to use qmake instead of hardcoding plugin install dirs
From: "Alex Merry" <alex.merry () kde ! org>
Date: 2014-08-29 11:59:13
Message-ID: 20140829115913.11205.69649 () probe ! kde ! org
[Download RAW message or body]
--===============6696440415174873154==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
> On Aug. 27, 2014, 6:05 p.m., Alex Merry wrote:
> > modules/ECMQueryQmake.cmake, line 1
> > <https://git.reviewboard.kde.org/r/119901/diff/6/?file=307834#file307834line1>
> >
> > I think we need to be a bit more clever here. I'd go for a cache variable, and if \
> > (TARGET Qt5::qmake), set the default to that, otherwise set the default to just \
> > "qmake".
You might also consider doing
find_package(Qt5Core QUIET)
if this is only going to be included when KDE_ECM_INSTALL_TO_QT_SYS_DIR is set.
- Alex
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/119901/#review65382
-----------------------------------------------------------
On Aug. 27, 2014, 1:11 p.m., Rohan Garg wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/119901/
> -----------------------------------------------------------
>
> (Updated Aug. 27, 2014, 1:11 p.m.)
>
>
> Review request for Build System and KDE Frameworks.
>
>
> Repository: extra-cmake-modules
>
>
> Description
> -------
>
> Use qmake to query dirs for plugins and imports instead of hardcoding them in ECM.
>
>
> Diffs
> -----
>
> modules/ECMQueryQmake.cmake PRE-CREATION
> kde-modules/KDEInstallDirs.cmake 880539b
> modules/ECMGeneratePriFile.cmake 34001d6
>
> Diff: https://git.reviewboard.kde.org/r/119901/diff/
>
>
> Testing
> -------
>
> Seems to work on my system.
>
>
> Thanks,
>
> Rohan Garg
>
>
--===============6696440415174873154==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/119901/">https://git.reviewboard.kde.org/r/119901/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On August 27th, 2014, 6:05 p.m. UTC, <b>Alex \
Merry</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/119901/diff/6/?file=307834#file307834line1" \
style="color: black; font-weight: bold; text-decoration: \
underline;">modules/ECMQueryQmake.cmake</a> <span style="font-weight: normal;">
(Diff revision 6)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="nb">get_target_property</span><span class="p">(</span><span \
class="s">QMAKE_EXECUTABLE</span> <span class="s">Qt5::qmake</span> <span \
class="s">LOCATION</span><span class="p">)</span></pre></td> </tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I \
think we need to be a bit more clever here. I'd go for a cache variable, and if \
(TARGET Qt5::qmake), set the default to that, otherwise set the default to just \
"qmake".</p></pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">You might also consider doing<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> find_package(Qt5Core \
QUIET)<br style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;" /> if this is only going to be included when \
KDE_ECM_INSTALL_TO_QT_SYS_DIR is set.</p></pre> <br />
<p>- Alex</p>
<br />
<p>On August 27th, 2014, 1:11 p.m. UTC, Rohan Garg wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Build System and KDE Frameworks.</div>
<div>By Rohan Garg.</div>
<p style="color: grey;"><i>Updated Aug. 27, 2014, 1:11 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
extra-cmake-modules
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Use qmake to query dirs for plugins and imports \
instead of hardcoding them in ECM.</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Seems to work on my system.</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>modules/ECMQueryQmake.cmake <span style="color: grey">(PRE-CREATION)</span></li>
<li>kde-modules/KDEInstallDirs.cmake <span style="color: grey">(880539b)</span></li>
<li>modules/ECMGeneratePriFile.cmake <span style="color: grey">(34001d6)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/119901/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============6696440415174873154==--
_______________________________________________
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic