Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-05 Thread Wayne Stambaugh
I committed your patch. Thanks. On 9/5/2016 2:03 AM, Nick Østergaard wrote: > I have attached a new patch that should apply cleanly. > > 2016-09-05 1:17 GMT+02:00 Wayne Stambaugh : >> Nick, >> >> Your patch 1 did not apply against Jon's changes to compiling.md. >> Please

Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-05 Thread Nick Østergaard
I have attached a new patch that should apply cleanly. 2016-09-05 1:17 GMT+02:00 Wayne Stambaugh : > Nick, > > Your patch 1 did not apply against Jon's changes to compiling.md. > Please rebase and send me the new patch when you get a chance. > > Thanks, > > Wayne > > On

Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-04 Thread Wayne Stambaugh
Nick, Your patch 1 did not apply against Jon's changes to compiling.md. Please rebase and send me the new patch when you get a chance. Thanks, Wayne On 9/3/2016 5:05 PM, Nick Østergaard wrote: > I also prepared some patches to address this issue with the switch, > but I did not submit them,

Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-04 Thread Wayne Stambaugh
If I'm going to go through the trouble to squash them, why not just squash them on your end and just send me a single patch and I can just use git am? On 9/3/2016 5:09 PM, Nick Østergaard wrote: > I just made my changes in multiple patches such that they are easy to > review, they should probably

Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-04 Thread Wayne Stambaugh
Patches 2 an 3 committed thanks. On 9/3/2016 4:28 PM, Jon Neal wrote: > 0001 changes the USE_OCE flag to KICAD_USE_OCE as discussed. > 0002 adds libngspice and OCE to the INSTALL.txt dependencies list and > removes a dead link > 0003 updates compiling.md to remove bzr

Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-04 Thread Wayne Stambaugh
Jon, FYI, patch 3 contains trailing whitespace. I'll clean it up this time. Wayne On 9/3/2016 4:28 PM, Jon Neal wrote: > 0001 changes the USE_OCE flag to KICAD_USE_OCE as discussed. > 0002 adds libngspice and OCE to the INSTALL.txt dependencies list and > removes a dead link > 0003 updates

Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-04 Thread Nick Østergaard
Yes 2016-09-04 23:01 GMT+02:00 Wayne Stambaugh : > So I have this straight: > > John's 0002 and 0003 patches > Nick's 0001, 0002, and 0003 patches > > Is this correct? > > On 9/3/2016 5:09 PM, Nick Østergaard wrote: >> I just made my changes in multiple patches such that

Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-04 Thread Wayne Stambaugh
So I have this straight: John's 0002 and 0003 patches Nick's 0001, 0002, and 0003 patches Is this correct? On 9/3/2016 5:09 PM, Nick Østergaard wrote: > I just made my changes in multiple patches such that they are easy to > review, they should probably be squashed with the commit description >

Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-03 Thread Nick Østergaard
I just made my changes in multiple patches such that they are easy to review, they should probably be squashed with the commit description if committed. 2016-09-03 23:05 GMT+02:00 Nick Østergaard : > I also prepared some patches to address this issue with the switch, > but I

Re: [Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-03 Thread Nick Østergaard
I also prepared some patches to address this issue with the switch, but I did not submit them, because no one commented further on it. But for the git descriptions, why do you suggest "-b master" for the git clone, that should not be necessary. My patches replaces the 0001 patch of Jon's, they

[Kicad-developers] [PATCH] A few small changes to CMake and the compiling instructions

2016-09-03 Thread Jon Neal
0001 changes the USE_OCE flag to KICAD_USE_OCE as discussed. 0002 adds libngspice and OCE to the INSTALL.txt dependencies list and removes a dead link 0003 updates compiling.md to remove bzr references and adds info about the KICAD_USE_OCE flag Jon From ba66aab6cdfcb3ad9ea0c2c130470b92c2611c0b