<table><tr><td style="">apol requested changes to this revision.<br />apol added inline comments.<br />This revision now requires changes to proceed.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D20509">View Revision</a></tr></table><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D20509#inline-115504">View Inline</a><span style="color: #4b4d51; font-weight: bold;">ECMAndroidDeployQt.cmake:41</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; ">        <span style="color: #304a96">if</span> <span class="p">(</span><span style="color: #766510">NOT</span> <span style="color: #766510">VALUE</span> <span style="color: #766510">STREQUAL</span> <span style="color: #766510">""</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">            <span style="color: #304a96">string<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">FIND</span></span><span class="bright"> </span><span style="color: #766510"><span class="bright">"${VALUE}"</span></span><span class="bright"> </span><span style="color: #766510"><span class="bright">".</span>so\"" OUT)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #766510">            <span class="bright">math(EXPR OUT</span> "</span><span style="color: #aa2211">${</span><span style="color: #001294">OUT</span><span style="color: #aa2211">}<span class="bright"></span></span><span class="bright"></span><span style="color: #766510"><span class="bright">+4</span></span><span style="color: #766510">")</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #766510">            string(SUBSTRING "</span><span style="color: #aa2211">${</span><span style="color: #001294">VALUE</span><span style="color: #aa2211">}</span><span style="color: #766510">" 0 ${OUT} OUTSTR)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #766510">            file(WRITE ${CMAKE_BINARY_DIR}/stl "</span><span style="color: #aa2211">${</span><span style="color: #001294">OUTSTR</span><span style="color: #aa2211">}</span><span style="color: #766510">")</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">            <span style="color: #304a96">string<span class="bright"></span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">REGEX</span></span><span class="bright"> </span><span style="color: #766510"><span class="bright">MATCH</span></span><span class="bright"> </span><span style="color: #766510"><span class="bright">"\"</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">.+shared\.</span>so\</span><span style="color: #766510">""</span> <span style="color: #766510">OUT<span class="bright"></span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">${</span></span><span class="bright"></span><span style="color: #001294"><span class="bright">VALUE</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">}</span></span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">            <span class="bright"></span><span style="color: #304a96"><span class="bright">file</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">WRITE</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">${</span></span><span class="bright"></span><span style="color: #001294"><span class="bright">CMAKE_BINARY_DIR</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">}</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">/stl</span></span> <span style="color: #766510">"${OUT}"</span><span class="p">)</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Please split into a separate patch.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D20509#inline-115505">View Inline</a><span style="color: #4b4d51; font-weight: bold;">ECMAndroidDeployQt.cmake:41</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; ">        <span style="color: #304a96">if</span> <span class="p">(</span><span style="color: #766510">NOT</span> <span style="color: #766510">VALUE</span> <span style="color: #766510">STREQUAL</span> <span style="color: #766510">""</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">            <span style="color: #304a96">string<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">FIND</span></span><span class="bright"> </span><span style="color: #766510"><span class="bright">"${VALUE}"</span></span><span class="bright"> </span><span style="color: #766510"><span class="bright">".</span>so\"" OUT)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #766510">            <span class="bright">math(EXPR OUT</span> "</span><span style="color: #aa2211">${</span><span style="color: #001294">OUT</span><span style="color: #aa2211">}<span class="bright"></span></span><span class="bright"></span><span style="color: #766510"><span class="bright">+4</span></span><span style="color: #766510">")</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #766510">            string(SUBSTRING "</span><span style="color: #aa2211">${</span><span style="color: #001294">VALUE</span><span style="color: #aa2211">}</span><span style="color: #766510">" 0 ${OUT} OUTSTR)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #766510">            file(WRITE ${CMAKE_BINARY_DIR}/stl "</span><span style="color: #aa2211">${</span><span style="color: #001294">OUTSTR</span><span style="color: #aa2211">}</span><span style="color: #766510">")</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">            <span style="color: #304a96">string<span class="bright"></span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">REGEX</span></span><span class="bright"> </span><span style="color: #766510"><span class="bright">MATCH</span></span><span class="bright"> </span><span style="color: #766510"><span class="bright">"\"</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">.+shared\.</span>so\</span><span style="color: #766510">""</span> <span style="color: #766510">OUT<span class="bright"></span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">${</span></span><span class="bright"></span><span style="color: #001294"><span class="bright">VALUE</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">}</span></span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">            <span class="bright"></span><span style="color: #304a96"><span class="bright">file</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">WRITE</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">${</span></span><span class="bright"></span><span style="color: #001294"><span class="bright">CMAKE_BINARY_DIR</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">}</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">/stl</span></span> <span style="color: #766510">"${OUT}"</span><span class="p">)</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">what if it's using an stl version that isn't called <tt style="background: #ebebeb; font-size: 13px;">.+shared.so</tt>?</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D20509#inline-115502">View Inline</a><span style="color: #4b4d51; font-weight: bold;">specifydependencies.cmake:24</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">function</span><span class="p">(</span><span style="color: #766510">duplicate</span> <span style="color: #766510">libpath</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span style="color: #304a96">get_filename_component</span> <span class="p">(</span><span style="color: #766510">name</span> <span style="color: #aa2211">${</span><span style="color: #001294">libpath</span><span style="color: #aa2211">}</span> <span style="color: #766510">NAME</span><span class="p">)</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I'd call the function <tt style="background: #ebebeb; font-size: 13px;">contains_library</tt>, as is it looks that it's duplicating something.</p>

<p style="padding: 0; margin: 8px;">Also pass the output value as an argument instead of magically declaring IS_EQUAL.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D20509#inline-115503">View Inline</a><span style="color: #4b4d51; font-weight: bold;">specifydependencies.cmake:40</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">            <span style="color: #304a96">message</span> <span class="p">(</span><span style="color: #766510">STATUS</span> <span style="color: #766510">"found duplicate, skipping: "</span> <span style="color: #aa2211">${</span><span style="color: #001294">extralib</span><span style="color: #aa2211">}</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">            <span style="color: #304a96">set</span> <span class="p">(</span><span style="color: #766510">IS_EQUAL</span> <span style="color: #766510">FALSE</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span style="color: #304a96">else</span><span class="p">()</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">It shouldn't be necessary to set it back again.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R240 Extra CMake Modules</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D20509">https://phabricator.kde.org/D20509</a></div></div><br /><div><strong>To: </strong>sh-zam, apol, vkrause<br /><strong>Cc: </strong>kde-buildsystem, kde-frameworks-devel, bencreasy, michaelh, ngraham, bruns<br /></div>