<div class="gmail_quote">On Fri, Oct 15, 2010 at 8:23 AM, Bill Hoffman <span dir="ltr"><<a href="mailto:bill.hoffman@kitware.com">bill.hoffman@kitware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class="im">On 10/14/2010 2:18 PM, David Cole wrote:<br>
</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">
On Thu, Oct 14, 2010 at 1:30 PM, Alexander Neundorf <<a href="mailto:neundorf@kde.org" target="_blank">neundorf@kde.org</a><br></div><div class="im">
<mailto:<a href="mailto:neundorf@kde.org" target="_blank">neundorf@kde.org</a>>> wrote:<br>
<br>
On Wednesday 13 October 2010, Alexander Neundorf wrote:<br>
> On Wednesday 13 October 2010, Bill Hoffman wrote:<br>
> > So, I think we have to use the new name approach. Do we want<br>
to call it<br>
> > 2? Or should we call it something else?<br>
> ><br>
> > Alex, do you have time to do this?<br>
><br>
> I think it's not a good solution, and the one with<br>
CURRENT_LIST_DIR is<br>
> definitely better and already implemented.<br>
> And I am still convinced that I am right here, see my other mails.<br>
<br>
So I would suggest to merge the CURRENT_LIST_DIR branch for 2.8.3,<br>
and as soon<br>
as 2.8.3 is released, remove the full paths again and enable the new<br>
CMP0017<br>
instead (prefer CMAKE_ROOT when include()d from CMAKE_ROOT) and then<br>
see what<br>
happens during the whole 2.8.4 cycle.<br>
<br>
I think this (CMP0017) is necessary, because otherwise we can only hope<br>
nothing breaks with future releases (independent from FPHSA).<br>
<br>
Alex<br>
_______________________________________________<br>
cmake-developers mailing list<br></div>
<a href="mailto:cmake-developers@cmake.org" target="_blank">cmake-developers@cmake.org</a> <mailto:<a href="mailto:cmake-developers@cmake.org" target="_blank">cmake-developers@cmake.org</a>><div class="im"><br>
<a href="http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers" target="_blank">http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers</a><br>
<br>
<br>
<br>
I'm ok with this since Alex feels so strongly about it, and the code<br>
change is restricted to using CMAKE_CURRENT_LIST_DIR only when including<br>
FPHSA.cmake... (i.e. -- it should not affect including *other* files<br>
from inside of modules that are presently overridden... which was my<br>
concern -- that we'd break some *other* scenario -- since that's not<br>
true, I retract my objection.)<br>
<br>
To review the change yourself:<br>
git fetch stage<br>
gitk remotes/stage/AddCMAKE_CURRENT_LIST_DIR<br>
<br>
Look at the top 3 commits. Looks pretty safe. I'd say we should merge it<br>
to 'next' and then after a night on the dashboards, merge it to 'master'<br>
and do an rc3 release based on that.<br>
<br>
</div></blockquote>
<br>
OK, lets try this one. Lets move it to next.<br><font color="#888888">
<br>
-Bill</font><div><div></div><div class="h5"><br>
_______________________________________________<br>
cmake-developers mailing list<br>
<a href="mailto:cmake-developers@cmake.org" target="_blank">cmake-developers@cmake.org</a><br>
<a href="http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers" target="_blank">http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers</a><br>
</div></div></blockquote></div><div><br></div><br><div>I'm trying to merge this, and getting conflicts when merging to 'next' because of changes in cmMakefile.cxx like this:</div><div><p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; min-height: 16.0px">
<br></p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo"> <span style="color: #c22a9f">this</span>->AddDefinition(<span style="color: #da2e24">"CMAKE_CURRENT_LIST_FILE"</span>, filenametoread);</p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo"><<<<<<< HEAD</p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo"> <span style="color: #c22a9f">this</span>->MarkVariableAsUsed(<span style="color: #da2e24">"CMAKE_CURRENT_LIST_FILE"</span>);</p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo">=======</p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; color: #da2e24"><span style="color: #000000"> </span><span style="color: #c22a9f">this</span><span style="color: #000000">->AddDefinition(</span>"CMAKE_CURRENT_LIST_DIR"<span style="color: #000000">,</span></p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo"> cmSystemTools::GetFilenamePath(filenametoread).c_str());</p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo">>>>>>>> AddCMAKE_CURRENT_LIST_DIR</p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; min-height: 16.0px"><br></p><p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; min-height: 16.0px"><br></p><p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; min-height: 16.0px">
<span class="Apple-style-span" style="font-family: arial; font-size: small; ">What's the best way to resolve this conflict? Should I delete the MarkVariableAsUsed lines because they're part of the dev/strict-mode branch which is *not* going into 2.8.3?</span></p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; min-height: 16.0px"><span class="Apple-style-span" style="font-family: arial; font-size: small; "><br></span></p><p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; min-height: 16.0px">
<span class="Apple-style-span" style="font-family: arial; font-size: small; ">If I leave the MarkVariableAsUsed call in there, does if affect how the commit will merge to 'master'...?</span></p><p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; min-height: 16.0px">
<span class="Apple-style-span" style="font-family: arial; font-size: small; "><br></span></p><p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; min-height: 16.0px"><span class="Apple-style-span" style="font-family: arial; font-size: small; ">Arg.</span></p>
<p style="margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Menlo; min-height: 16.0px"><span class="Apple-style-span" style="font-family: arial; font-size: small; "><br></span></p></div>