<table><tr><td style="">kfunk requested changes to this revision.<br />kfunk 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/D8158" rel="noreferrer">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/D8158#inline-34321" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">CMakeLists.txt:133</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);"> # Get rid of the leading 'v':
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> string(SUBSTRING "${GIT_FULL_VERSION}" 1 -1 KDevelop_FULL_VERSION)
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> message(STATUS "KDevelop_FULL_VERSION=${KDevelop_FULL_VERSION}")
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Please just *amend* the version as specified by CMake (that is, re-use VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH). We don't want to fully overwrite the things set in CMakeLists.txt.</p>
<p style="padding: 0; margin: 8px;">Something along:<br />
<tt style="background: #ebebeb; font-size: 13px;">set(KDevelop_FULLVERSION_STRING "${KDEVELOP_VERSION_STRING} (git ${SHA1}")</tt></p>
<p style="padding: 0; margin: 8px;">Please check what Krita does in their CMakeLists.txt, I'd like something similar.</p>
<p style="padding: 0; margin: 8px;">FWIW, they use this to get the SHA1:<br />
<tt style="background: #ebebeb; font-size: 13px;">get_git_head_revision(GIT_REFSPEC GIT_SHA1)</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/D8158#inline-34322" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">CMakeLists.txt:134</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);"> string(SUBSTRING "${GIT_FULL_VERSION}" 1 -1 KDevelop_FULL_VERSION)
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> message(STATUS "KDevelop_FULL_VERSION=${KDevelop_FULL_VERSION}")
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">else()
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Print this in a more human-readable way, i.e. <tt style="background: #ebebeb; font-size: 13px;">Setting KDevelop version to: ...</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/D8158#inline-34324" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">GetGitRevisionDescription.cmake:1</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: #74777d"># - Returns a version string from Git</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #74777d">#</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This copy is not current.</p>
<p style="padding: 0; margin: 8px;">I'm getting:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">makeobj[0]: Entering directory `/home/kfunk/devel/build/kf5/kdevelop-5.2'
[0/1] Re-running CMake...
CMake Warning at cmake/modules/GetGitRevisionDescription.cmake:121 (message):
" describe 8bab57d14644f7f1d2a263a243745014bce5745c " failed with exit code
No such file or directory, out=
Call Stack (most recent call first):
CMakeLists.txt:124 (git_describe)</pre></div>
<p style="padding: 0; margin: 8px;">Please use the most recent version from <a href="https://github.com/rpavlik/cmake-modules/blob/master" class="remarkup-link" target="_blank" rel="noreferrer">https://github.com/rpavlik/cmake-modules/blob/master</a> (it seems to work fine with that version from there).</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/D8158#inline-34323" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kdevelop-fullversion.h.cmake:1</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: #74777d">#ifndef KDEVELOP_FULLVERSION_H</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #74777d">#define KDEVELOP_FULLVERSION_H</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">kdevelop-fullversion.h -> kdevelop_fullversion.h. <tt style="background: #ebebeb; font-size: 13px;">FULLVERSION</tt> -> <tt style="background: #ebebeb; font-size: 13px;">KDevelop_FULLVERSION_STRING</tt>.</p>
<p style="padding: 0; margin: 8px;">Then this is consistent with kdevelop_version.h as generated by <tt style="background: #ebebeb; font-size: 13px;">ecm_setup_version()</tt>.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R32 KDevelop</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D8158" rel="noreferrer">https://phabricator.kde.org/D8158</a></div></div><br /><div><strong>To: </strong>rjvbb, KDevelop, brauch, kfunk<br /><strong>Cc: </strong>kossebau, flherne, mwolff, brauch, kdevelop-devel, geetamc, Pilzschaf, akshaydeo, surgenight, arrowdodger<br /></div>