On 12 November 2013 12:29, Dick Hollenbeck <d...@softplc.com> wrote: > On 11/12/2013 05:19 AM, Brian Sidebotham wrote: > > Hi Dick, > > > > Sorry, I don't mean to waste your time by passing everything under your > nose before > > committing, but I would rather get a quick ok and then commit the > following. > > > > BZR4454 breaks windows builds because bzr patch fails on re-applying a > patch that has > > already been applied to the branch of an external project. There are no > switches available > > to ignore previously applied patches and so it just fails. > > I don't think the problem is specific to commit 4454. And it is not > unique to windows. > One way forward on linux was to first > > $rm -rf <cmake_source_root>/.downloads-by-cmake/boost_1_54_0/ > > This kept the download, but removed the un-tarred boost source. > Then run the build. > > Or do a 'make clean' first. > > But since 'bzr revert' succeeds even on a pristine branch, your solution > seems to be OK. > If ever that were to change, (bzr revert succeeding on a pristine branch), > it would no > longer work. > > Below is a starting point for a commit log entry: > > > " > > Although CMake keeps time stamps to remember how far it got in an > ExternalProject_Add() > build, it throws the time stamps away when there are edits to the > CMakeLists.txt portion > pertaining to the external project. Only a 'make clean' would remove the > untarred tree. > This patch removes the need to do a make clean when changing the > ExternalProject_Add() > text pertinent to patching. > > Thanks Dick, I'll commit now.
Best Regards, Brian.
_______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
