On Thu, Jan 21, 2016 at 2:28 PM, Sean McBride <[email protected]> wrote: > On Tue, 5 Jan 2016 14:54:47 -0500, Matt McCormick said: > >>To update GDCM, run the >> >> Modules/ThirdParty/GDCM/UpdateFromUpstream.sh >> >>script. >> >> >>Since GDCM 2.6 has been released, we should switch from GDCM "master" >>to GDCM "release" before doing the update. > > Even more conservatively, I'll start from the "release-2-4" branch.
Sounds good. > So now the update script works on OS X, Cool! > I've run it successfully and did: > > git merge -X subtree=Modules/ThirdParty/GDCM/src/gdcm upstream-gdcm > > as it instructs. This leaves one file conflicted: > > Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt > > Due to the change in git SHA 70306386. It should probably still be kept. If it is still relevant to upstream, it could be submitted. Thanks, Matt _______________________________________________ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Kitware offers ITK Training Courses, for more information visit: http://kitware.com/products/protraining.php Please keep messages on-topic and check the ITK FAQ at: http://www.itk.org/Wiki/ITK_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/insight-developers
