<div dir="ltr">Hi Matt,<div><br></div><div>Many thanks. Unfortunately the suggested command did not solve the problem, see attachment.</div><div><br></div><div>Many thanks.</div><div>Tunde</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 12 November 2015 at 21:05, Matt McCormick <span dir="ltr"><<a href="mailto:matt.mccormick@kitware.com" target="_blank">matt.mccormick@kitware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Tunde,<br>
<br>
The prompt indicates the repository is an intermediate state<br>
(MERGING), and git is not allowing the requested actions because it<br>
does not want changes made in that intermediate state to get lost.<br>
<br>
To get out of the intermediate state, use<br>
<br>
git reset --hard origin/master<br>
<br>
then try again.<br>
<br>
HTH,<br>
Matt<br>
<br>
On Thu, Nov 12, 2015 at 2:52 PM, Tünde Szilágyi<br>
<div class="HOEnZb"><div class="h5"><<a href="mailto:a.tunde.szilagyi@gmail.com">a.tunde.szilagyi@gmail.com</a>> wrote:<br>
> Hi Matt,<br>
><br>
> Many thanks. I went through the suggested routes (see attachment). I am<br>
> certain that I am doing something wrong (but I do not understand what it<br>
> might be), because I am getting similar error messages.<br>
><br>
> Many thanks.<br>
> Tunde<br>
><br>
> On 12 November 2015 at 19:33, Matt McCormick <<a href="mailto:matt.mccormick@kitware.com">matt.mccormick@kitware.com</a>><br>
> wrote:<br>
>><br>
>> Hi Tunde,<br>
>><br>
>> I mistakenly thought you were working on the "release" branch, so I<br>
>> expected the commands to run would be<br>
>><br>
>> git checkout release<br>
>> git pull<br>
>><br>
>> If you were not working on the release branch, it can be created locally<br>
>> with<br>
>><br>
>> git checkout -b release origin/release<br>
>> git pull<br>
>><br>
>> It is possible to also directly get the patch from Gerrit, but not do<br>
>> use the 'pull' line for this case. Instead, use the 'checkout' line,<br>
>> i.e.<br>
>><br>
>> git fetch <a href="http://review.source.kitware.com/ITK" rel="noreferrer" target="_blank">http://review.source.kitware.com/ITK</a><br>
>> refs/changes/54/20154/1 && git checkout FETCH_HEAD -b CMP0054<br>
>><br>
>> Note that "-b CMP0054" was added to give a branch name.<br>
>><br>
>> But, the 4.8.2 archives were just created from the latest "release"<br>
>> branch, so those can be tried too:<br>
>><br>
>> <a href="https://sourceforge.net/projects/itk/files/itk/4.8/" rel="noreferrer" target="_blank">https://sourceforge.net/projects/itk/files/itk/4.8/</a><br>
>><br>
>><br>
>> Thanks for testing and providing feedback.<br>
>><br>
>> Matt<br>
>><br>
>> On Thu, Nov 12, 2015 at 9:32 AM, Tünde Szilágyi<br>
>> <<a href="mailto:a.tunde.szilagyi@gmail.com">a.tunde.szilagyi@gmail.com</a>> wrote:<br>
>> > Hi Matt,<br>
>> ><br>
>> > I have pulled the suggested patch, but I am having the error message<br>
>> > attached. I would appreciate any feedback from anyone.<br>
>> ><br>
>> > Many thanks in advance.<br>
>> ><br>
>> > Best wishes,<br>
>> > Tunde<br>
>> ><br>
>> > On 5 November 2015 at 21:04, Matt McCormick <<a href="mailto:matt.mccormick@kitware.com">matt.mccormick@kitware.com</a>><br>
>> > wrote:<br>
>> >><br>
>> >> Hi Tunde,<br>
>> >><br>
>> >> These CMake warnings are addressed by this patch:<br>
>> >><br>
>> >> <a href="http://review.source.kitware.com/#/c/20154/1" rel="noreferrer" target="_blank">http://review.source.kitware.com/#/c/20154/1</a><br>
>> >><br>
>> >> which I just backported to the "release" branch. Please 'git pull' to<br>
>> >> fetch the changes.<br>
>> >><br>
>> >> Please let the list know if there are any other issues. According to<br>
>> >> the dashboard, there are also some warnings to address:<br>
>> >><br>
>> >> <a href="https://open.cdash.org/viewBuildError.php?type=1&buildid=4088244" rel="noreferrer" target="_blank">https://open.cdash.org/viewBuildError.php?type=1&buildid=4088244</a><br>
>> >><br>
>> >> Patches for these warnings would be welcome :-)<br>
>> >><br>
>> >> Thanks,<br>
>> >> Matt<br>
>> >><br>
>> >> On Thu, Nov 5, 2015 at 2:47 PM, Tünde Szilágyi<br>
>> >> <<a href="mailto:a.tunde.szilagyi@gmail.com">a.tunde.szilagyi@gmail.com</a>> wrote:<br>
>> >> > Hi Matt,<br>
>> >> ><br>
>> >> > Thank you, this fixed some of the problems I was facing. Now I can<br>
>> >> > build<br>
>> >> > some packages except the ITKNumerics, ITKStatistics and ITKFEM. I<br>
>> >> > have<br>
>> >> > attached the error message that I received in CMAKE. There are no<br>
>> >> > explanations in the MS VS 2015 during build.<br>
>> >> ><br>
>> >> > Many thanks in advance.<br>
>> >> ><br>
>> >> > Tunde<br>
>> >> ><br>
>> >> ><br>
>> >> > On 5 November 2015 at 16:22, Matt McCormick<br>
>> >> > <<a href="mailto:matt.mccormick@kitware.com">matt.mccormick@kitware.com</a>><br>
>> >> > wrote:<br>
>> >> >><br>
>> >> >> Hi Tunde,<br>
>> >> >><br>
>> >> >> A few pointers:<br>
>> >> >><br>
>> >> >> - Use ITK Git master [1], which has support for Visual Studio 2015<br>
>> >> >> (support is not available in ITK 4.8.1).<br>
>> >> >> - If wrapping is built, ITK Git master also builds much faster.<br>
>> >> >> - Turn off BUILD_TESTING and BUILD_EXAMPLES in your CMake<br>
>> >> >> configuration to greatly improve the build time.<br>
>> >> >><br>
>> >> >> HTH,<br>
>> >> >> Matt<br>
>> >> >><br>
>> >> >> [1] <a href="http://www.itk.org/Wiki/ITK/Git" rel="noreferrer" target="_blank">http://www.itk.org/Wiki/ITK/Git</a><br>
>> >> >><br>
>> >> >> On Thu, Nov 5, 2015 at 7:03 AM, Tünde Szilágyi<br>
>> >> >> <<a href="mailto:a.tunde.szilagyi@gmail.com">a.tunde.szilagyi@gmail.com</a>> wrote:<br>
>> >> >> > Dear Brad,<br>
>> >> >> ><br>
>> >> >> > Thank you for your feedback. I figured out that my error occurs<br>
>> >> >> > during<br>
>> >> >> > CMake<br>
>> >> >> > Configuration. I have attached an error message that I receive.<br>
>> >> >> > Files<br>
>> >> >> > from<br>
>> >> >> > the same family are throwing this error - all start with<br>
>> >> >> > cmTC_XXXXX.exe<br>
>> >> >> > (see<br>
>> >> >> > attached Screen Shoot). If I ignore this and Build All in MS<br>
>> >> >> > Visual<br>
>> >> >> > Studio<br>
>> >> >> > the Debug and Release is not populated (And there are no error<br>
>> >> >> > messages<br>
>> >> >> > either.). I would appreciate any insight into this.<br>
>> >> >> ><br>
>> >> >> > Many thanks.<br>
>> >> >> > Tunde<br>
>> >> >> ><br>
>> >> >> > On 5 November 2015 at 12:55, Bradley Lowekamp<br>
>> >> >> > <<a href="mailto:blowekamp@mail.nih.gov">blowekamp@mail.nih.gov</a>><br>
>> >> >> > wrote:<br>
>> >> >> >><br>
>> >> >> >> Hello,<br>
>> >> >> >><br>
>> >> >> >> I don't think I have built ITK with the MS VS 12 2015 GUI. But I<br>
>> >> >> >> do<br>
>> >> >> >> have a<br>
>> >> >> >> dashboard build with the compiler:<br>
>> >> >> >><br>
>> >> >> >> <a href="https://open.cdash.org/buildSummary.php?buildid=4088244" rel="noreferrer" target="_blank">https://open.cdash.org/buildSummary.php?buildid=4088244</a><br>
>> >> >> >><br>
>> >> >> >> This take about 3 hours, on a 4 core 4 GB memory virtual machine.<br>
>> >> >> >><br>
>> >> >> >> Perhaps you could try building from the command line with cmake?<br>
>> >> >> >><br>
>> >> >> >> cmake --build . --config Release<br>
>> >> >> >><br>
>> >> >> >><br>
>> >> >> >><br>
>> >> >> >> HTH,<br>
>> >> >> >> Brad<br>
>> >> >> >><br>
>> >> >> >> On Nov 5, 2015, at 5:11 AM, Tünde Szilágyi<br>
>> >> >> >> <<a href="mailto:a.tunde.szilagyi@gmail.com">a.tunde.szilagyi@gmail.com</a>><br>
>> >> >> >> wrote:<br>
>> >> >> >><br>
>> >> >> >> Dear All,<br>
>> >> >> >><br>
>> >> >> >> I would be interested what is the expected time to build all the<br>
>> >> >> >> ITK<br>
>> >> >> >> libraries for the first time in Microsoft Visual Studio 14 2015.<br>
>> >> >> >> It<br>
>> >> >> >> shows me<br>
>> >> >> >> that there 492 projects to build. It has been running for more<br>
>> >> >> >> then<br>
>> >> >> >> 17h<br>
>> >> >> >> on a<br>
>> >> >> >> 2.84 GHz CPU, using 4.6 out of 7.9 GB memory without error<br>
>> >> >> >> message.<br>
>> >> >> >> Perhaps<br>
>> >> >> >> I misunderstood this process?<br>
>> >> >> >><br>
>> >> >> >> Many thanks.<br>
>> >> >> >><br>
>> >> >> >> Best wishes,<br>
>> >> >> >> Tunde Szilagyi<br>
>> >> >> >> _______________________________________________<br>
>> >> >> >> Community mailing list<br>
>> >> >> >> <a href="mailto:Community@itk.org">Community@itk.org</a><br>
>> >> >> >> <a href="http://public.kitware.com/mailman/listinfo/community" rel="noreferrer" target="_blank">http://public.kitware.com/mailman/listinfo/community</a><br>
>> >> >> >><br>
>> >> >> >><br>
>> >> >> ><br>
>> >> >> ><br>
>> >> >> ><br>
>> >> >> > _______________________________________________<br>
>> >> >> > Community mailing list<br>
>> >> >> > <a href="mailto:Community@itk.org">Community@itk.org</a><br>
>> >> >> > <a href="http://public.kitware.com/mailman/listinfo/community" rel="noreferrer" target="_blank">http://public.kitware.com/mailman/listinfo/community</a><br>
>> >> >> ><br>
>> >> ><br>
>> >> ><br>
>> ><br>
>> ><br>
><br>
><br>
><br>
><br>
> --<br>
> --<br>
> Tunde<br>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">--<div>Tunde</div></div></div>
</div>