Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-18 Thread Nicolas Desprès
On Tue, Jul 17, 2012 at 11:39 PM, Bill Hoffman bill.hoff...@kitware.com wrote: On 7/17/2012 1:43 PM, Peter Kümmel wrote: On 17.07.2012 19:32, Bill Hoffman wrote: On 7/17/2012 1:21 PM, Peter Kümmel wrote: OK, maybe it is simpler to add a the functions to cmNinjaTargetGenerator which

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-18 Thread Peter Kümmel
On 18.07.2012 11:58, Nicolas Desprès wrote: On Tue, Jul 17, 2012 at 11:39 PM, Bill Hoffmanbill.hoff...@kitware.com wrote: On 7/17/2012 1:43 PM, Peter Kümmel wrote: On 17.07.2012 19:32, Bill Hoffman wrote: On 7/17/2012 1:21 PM, Peter Kümmel wrote: OK, maybe it is simpler to add a the

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-18 Thread Peter Kümmel
On 18.07.2012 11:58, Nicolas Desprès wrote: On Tue, Jul 17, 2012 at 11:39 PM, Bill Hoffmanbill.hoff...@kitware.com wrote: On 7/17/2012 1:43 PM, Peter Kümmel wrote: On 17.07.2012 19:32, Bill Hoffman wrote: On 7/17/2012 1:21 PM, Peter Kümmel wrote: OK, maybe it is simpler to add a the

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-18 Thread Nicolas Desprès
On Wed, Jul 18, 2012 at 12:10 PM, Peter Kümmel syntheti...@gmx.net wrote: On 18.07.2012 11:58, Nicolas Desprès wrote: On Tue, Jul 17, 2012 at 11:39 PM, Bill Hoffmanbill.hoff...@kitware.com wrote: On 7/17/2012 1:43 PM, Peter Kümmel wrote: On 17.07.2012 19:32, Bill Hoffman wrote: On

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-17 Thread Bill Hoffman
On 7/17/2012 8:10 AM, Peter Kümmel wrote: On 17.07.2012 13:45, David Cole wrote: Peter, can you rebase this on current 'master', push this to our stage as a branch, and merge it to 'next'...? Done. Let's see what happens on CDash. Looks ok, but is not building on Borland:

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-17 Thread Peter Kümmel
On 17.07.2012 15:39, Nicolas Desprès wrote: On Tue, Jul 17, 2012 at 3:29 PM, Bill Hoffmanbill.hoff...@kitware.com wrote: On 7/17/2012 8:10 AM, Peter Kümmel wrote: On 17.07.2012 13:45, David Cole wrote: Peter, can you rebase this on current 'master', push this to our stage as a branch, and

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-17 Thread Nicolas Desprès
On Tue, Jul 17, 2012 at 7:01 PM, Peter Kümmel syntheti...@gmx.net wrote: On 17.07.2012 15:39, Nicolas Desprès wrote: On Tue, Jul 17, 2012 at 3:29 PM, Bill Hoffmanbill.hoff...@kitware.com wrote: On 7/17/2012 8:10 AM, Peter Kümmel wrote: On 17.07.2012 13:45, David Cole wrote: Peter, can

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-17 Thread Peter Kümmel
On 17.07.2012 19:11, Nicolas Desprès wrote: I don't like the friend keyword either but I try to follow the current architecture of CMake. Yes, I know. In cmLocalUnixMakefileGenerator you can see that: friend class cmMakefileTargetGenerator; friend class

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-17 Thread Nicolas Desprès
On Tue, Jul 17, 2012 at 7:21 PM, Peter Kümmel syntheti...@gmx.net wrote: On 17.07.2012 19:11, Nicolas Desprès wrote: I don't like the friend keyword either but I try to follow the current architecture of CMake. Yes, I know. In cmLocalUnixMakefileGenerator you can see that: friend

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-17 Thread Bill Hoffman
On 7/17/2012 1:21 PM, Peter Kümmel wrote: OK, maybe it is simpler to add a the functions to cmNinjaTargetGenerator which forwards the call to the Local/Global classes. Lets just add the friend stuff for now so we can get the dashboard building again. Thanks. -- Bill Hoffman Kitware, Inc.

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-17 Thread Peter Kümmel
On 17.07.2012 19:32, Bill Hoffman wrote: On 7/17/2012 1:21 PM, Peter Kümmel wrote: OK, maybe it is simpler to add a the functions to cmNinjaTargetGenerator which forwards the call to the Local/Global classes. Lets just add the friend stuff for now so we can get the dashboard building again.

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-17 Thread Bill Hoffman
On 7/17/2012 1:43 PM, Peter Kümmel wrote: On 17.07.2012 19:32, Bill Hoffman wrote: On 7/17/2012 1:21 PM, Peter Kümmel wrote: OK, maybe it is simpler to add a the functions to cmNinjaTargetGenerator which forwards the call to the Local/Global classes. Lets just add the friend stuff for now

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-10 Thread Peter Kümmel
On 07.07.2012 20:54, Nicolas Desprès wrote: I have pushed the re-factor patch. Let me know what do you think. I have tested on Linux and MacOSX with the Makefile and Ninja generator and both work fine. I've tested it here and BundleTest still fails. It doesn't install the Resource files.

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-07 Thread Nicolas Desprès
On Fri, Jul 6, 2012 at 9:56 PM, Bill Hoffman bill.hoff...@kitware.com wrote: On 7/6/2012 12:45 PM, Nicolas Desprčs wrote: Both work. Generally I use helper class with language not supporting multiple inheritance but if you prefer not to use it that's not a problem. I'll do the patch. Thanks

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-07 Thread Claus Klein
On 07.07.2012, at 20:54, Nicolas Desprès wrote: I have pushed the re-factor patch. Let me know what do you think. I have tested on Linux and MacOSX with the Makefile and Ninja generator and both work fine. Which OS version and Tools do you have installed? I merged in your patch and have

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-07 Thread Nicolas Desprès
On Sat, Jul 7, 2012 at 9:02 PM, Claus Klein claus.kl...@arcormail.de wrote: On 07.07.2012, at 20:54, Nicolas Desprès wrote: I have pushed the re-factor patch. Let me know what do you think. I have tested on Linux and MacOSX with the Makefile and Ninja generator and both work fine. Which OS

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-06 Thread Nicolas Desprès
I forgot to say that most of the code is duplicated from the Makefile generator. I have left some todo but this code will need to be factored sooner or later. On Fri, Jul 6, 2012 at 12:54 PM, Nicolas Desprès nicolas.desp...@gmail.com wrote: Hi, I finally found the time to fix the Ninja

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-06 Thread David Cole
We should re-factor it sooner (not later). This is great, thank you very much! But we should definitely re-factor it before merging it to 'master' Thx, David On Fri, Jul 6, 2012 at 7:05 AM, Nicolas Desprès nicolas.desp...@gmail.com wrote: I forgot to say that most of the code is duplicated

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-06 Thread Peter Kümmel
On 06.07.2012 12:54, Nicolas Desprès wrote: Hi, I finally found the time to fix the Ninja generator on OS X. Mainly I have fixed ExportImport and Qt4Deploy. I based my work on jkp's work (https://github.com/jkp/CMake/commits/jkp/ninja-generator). Although there are other patches in this branch,

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-06 Thread Nicolas Desprès
I agree. Any idea how you would like to re-factor it? I am thinking about using multiple inheritance by introducing a cmOSXBundleGenerator class with CreateFramework and CreateAppBundle. WDYT? Cheers, Nico On Fri, Jul 6, 2012 at 1:13 PM, David Cole david.c...@kitware.com wrote: We should

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-06 Thread Nicolas Desprès
On Fri, Jul 6, 2012 at 1:29 PM, Peter Kümmel syntheti...@gmx.net wrote: On 06.07.2012 12:54, Nicolas Desprès wrote: Hi, I finally found the time to fix the Ninja generator on OS X. Mainly I have fixed ExportImport and Qt4Deploy. I based my work on jkp's work

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-06 Thread Bill Hoffman
On 7/6/2012 7:33 AM, Nicolas Desprès wrote: I agree. Any idea how you would like to re-factor it? I am thinking about using multiple inheritance by introducing a cmOSXBundleGenerator class with CreateFramework and CreateAppBundle. WDYT? Cheers, Nico Thanks, this is great. I am not a big fan

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-06 Thread Nicolas Desprès
On Fri, Jul 6, 2012 at 3:52 PM, Bill Hoffman bill.hoff...@kitware.com wrote: On 7/6/2012 7:33 AM, Nicolas Desprès wrote: I agree. Any idea how you would like to re-factor it? I am thinking about using multiple inheritance by introducing a cmOSXBundleGenerator class with CreateFramework and

Re: [cmake-developers] Ninja passes all tests on OS X

2012-07-06 Thread Bill Hoffman
On 7/6/2012 12:45 PM, Nicolas Desprès wrote: Both work. Generally I use helper class with language not supporting multiple inheritance but if you prefer not to use it that's not a problem. I'll do the patch. Thanks for answering. Great, thanks for doing the work. Lets go with the helper class,