[cmake-developers] Alternate if() without implicit variable expansion

Nils Gladitz nilsgladitz at gmail.com
Thu Sep 11 12:57:03 EDT 2014


On 11.09.2014 18:53, Brad King wrote:
> On 09/11/2014 11:52 AM, Nils Gladitz wrote:
>> cmConditionEvaluator.cxx doesn't exist without the CMP0054 changes
>> because I created it after I did most of the CMP0054 changes.
>> Since most of the changes are replacements rather than plain additions
>> *removing* those changes would mean having to restore those code parts
>> which however used to be in cmIf.cxx rather than cmConditionEvaluator.cxx.
> I think you missed the part about squashing your changes together
> into the first commit of the topic.  I just rewrote the topic
> to do that.  Now you can start working from commit 5922fc2c:

No I did that as well.

>   git checkout -b tmp 5922fc2c
>   git rm Help/policy/CMP0054.rst Help/release/dev/if-sanity.rst
>   git checkout HEAD~1 -- Help
>   git rm -rf Tests/RunCMake/CMP0054
>   git checkout HEAD~1 -- Tests/RunCMake/CMakeLists.txt
>   git commit --amend

I think I did all that too.

> Then keep editing the files and amending the commit to leave
> behind only the refactoring pieces.

That is the part I was stuck at.

Nils



More information about the cmake-developers mailing list