Re: [cmake-developers] conditionals in generator expressions
Stephen Kelly wrote: The destructor of cmCompiledGeneratorExpression is deleting the evaluators before they get used again in later evals. Commenting out the delete line fixes the crash but probably leaks. You need to work out the ownership semantics. Thanks. I'm too used to everything being implicitly shared :). Valgrind didn't show the problem, interestingly enough. A colleague tells me that gcc generates code that doesn't actually 'guard' memory immediately when the dtor is called, but Windows does, which could explain everything. Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On 09/15/2012 04:45 PM, Alexander Neundorf wrote: There is now a branch export-sets-2 on cmake stage. It cherry-picks a lot of the patches from http://gitorious.org/~urkud1/cmake/urkud-cmake/commits/w/export-set, mostly those from May, and then proceeds a bit differently. In the end, cmake now checks whether a target which is missing in the current export set has been exported and installed exactly once, gets the correct name from that one installation (i.e. the used namespace), and uses that. That simple approach will allow us to move forward with this. If anyone wants multiple exports of the same targets then they can add the explicit export set DEPENDS options later. The topic looks good except for the details below. Additionally it puts the following check in the generated target file: IF(NOT TARGET Foo::foo ) MESSAGE(FATAL_ERROR Required imported target \Foo::foo\ not found ! ) ENDIF() Please review the branch. Exotic cases are not supported, but it should be possible now to export libraries in separate export sets and still have it work. I guess I have to handle the error case better than simply erroring out. Not IMO. Remember my message here: http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/4374/focus=4386 The user has the option to specify a known-working pkg_DIR value or disable use of the package completely. Your commit message sentence I guess instead of completely erroring out it would be better to only make the find_package() fail. is not needed. Also, one of Yury's commit messages says: TODO: remove another clear() because it doesn't delete TargetExports. What is that about? Thanks, -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] conditionals in generator expressions
Stephen Kelly wrote: Good idea. Pushed to next with this modification. I've fixed all errors and warnings that can be fixed. Some remain due to compiler bugs which claim some code in a template is unreachable (but that's only due to the template parameters). I think it would make sense to rewrite the branch to squash the whitespace fixes before merging to master though. Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] conditionals in generator expressions
Stephen Kelly wrote: The next thing I want to do is to see if I can make full use of cmGeneratorTarget and use const proactively while doing so, to make the code more clear. I'm not 100% certain that's possible, but it's the next goal I have. Any comments on that? That would be a really great example of splitting configure-time constructs from generate-time constructs. Right. I investigated a little bit already and it seems there's at least some low-hanging fruit. I've put my work on the use-generator-target branch in my clone. Using const as proactively as I wanted is not really possible/worth it because of all the memoizing cmake does, but I've ported it to use cmGeneratorTarget enough to be able to add a cmGeneratorTarget::GetCompileDefinitions(const char *config) and use generator expressions in the implementation, and to use generator expressions in cmGeneratorTarget::GetIncludeDirectories(const char *config) too. That should be three trivial patches, but I haven't written them yet. That's all I'm aiming for of the target_use_targets feature for the next release, so I think that's still on track. Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] conditionals in generator expressions
Stephen Kelly wrote: too. That should be three trivial patches, but I haven't written them yet. That's all I'm aiming for of the target_use_targets feature for the next release, so I think that's still on track. I spoke too soon. It's 3 trivial patches and one DAG-checker. :) http://community.kde.org/Frameworks/Epics/CMake_target_usage_requirements#TODO Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0013544]: Visual Studio 2012 Express not supported
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=13544 == Reported By:Filip Konvicka (LOGIS) Assigned To: == Project:CMake Issue ID: 13544 Category: CMake Reproducibility:always Severity: major Priority: normal Status: new == Date Submitted: 2012-09-17 09:32 EDT Last Modified: 2012-09-17 09:32 EDT == Summary:Visual Studio 2012 Express not supported Description: Visual C++ 2012 Express is not detected properly. The registry paths (and possibly other things) in the Express version differ from the paid MSVS versions. Additional Information: The new registry path is HKEY_CURRENT_USER\\Software\\Microsoft\\WDExpress\\11.0_Config Also, the IDE exe name is no longer VCExpress.exe, but rather WDExpress.exe. == Issue History Date ModifiedUsername FieldChange == 2012-09-17 09:32 Filip Konvicka (LOGIS)New Issue == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] conditionals in generator expressions
On 09/17/2012 08:50 AM, Stephen Kelly wrote:
I've fixed all errors and warnings that can be fixed. Some remain due to
compiler bugs which claim some code in a template is unreachable (but that's
only due to the template parameters).
The HP warnings are not a compiler bug. It looks like other compilers
picked up on it too but you suppressed the warnings in the topic.
In this code:
templatebool linker, bool soname, bool dirQual, bool nameQual
...
// TODO: static_assert(!(name dir))
if(nameQual)
{
return cmSystemTools::GetFilenameName(result);
}
else if (dirQual)
{
return cmSystemTools::GetFilenamePath(result);
}
return result;
when either nameQual or dirQual is true that is a compile-time constant
so the return result line is truly unreachable in that instantiation.
You need to use compile-time conditional code rather than runtime
tests of compile-time constants. This is true for the other template
parameters too.
I think it would make sense to rewrite the branch to squash the whitespace
fixes before merging to master though.
Yes, I can do this when the topic is done.
-Brad
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Specifying VS target platform
On 09/14/2012 05:59 PM, Patrick Gansterer wrote:
Maybe you can merge the first patch already.
Yes, done.
The idea of a generator platform is not generic among all generators.
Rather than the general CMAKE_GENERATOR_PLATFORM infrastructure I'd
generator-specific handling. The value of -GP should be passed to the
global generator created from -G. If the generator does not support
platform specification in this way then -GP should be an error (all
generators except VS = 8). If the generator does support -GP then it
should do its own thing to save the value. For VS save it in a cache
entry like CMAKE_VS_PLATFORM (we have CMAKE_VS_PLATFORM_TOOLSET
already for the VS 10 toolchain in some cases).
I'm not a big fan of your ideas: What about the parts where we
pass the generator platform to other parts? Do we want to add
branches for every generator type to get get correct value for
the -GP parameter (e.g. if (CMAKE_GENERATOR == Visual Studio
...) -GP ${CMAKE_VS_PLATFORM})? IMHO that's not a good
idea. Also handling for making sure that generator platform
isn't changed by the user (like we do for -G already) in a
second run of CMake must be duplicated later if we add -GP to
more than one generator. (and so on...)
Good points, but we still need to reject -GP when using generators
for which it does not make sense. I think it may be moot anyway;
see below.
I realized that existing projects may test ${CMAKE_GENERATOR} to look
for things like Win64. For compatibility we need to make sure that
-G Visual Studio 10 -GP x64
results in CMAKE_GENERATOR being set to
-G Visual Studio 10 Win64
while processing CMake code even if it is not used that way
internally. Of course for future VS versions the generator names
will not need to work this way, only the existing ones.
Since we need to support -G Visual Studio 10 Win64 anyway, I don't see
much problem if such cases will work with -G Visual Studio 10 Win64,
but not with -G Visual Studio 10 -GP x64.
We are talking about changing the way the user selects the generator
in the GUI to be equivalent to -G/-GP. We cannot process existing
projects differently depending on how the generator was selected.
I also know there are projects that pass ${CMAKE_GENERATOR} to
internal invocations of CMake in order to say build it like I'm
built. These paths would not work if any information moved over
to CMAKE_GENERATOR_PLATFORM or an equivalent variable.
I think the value of -GP has to be stored in CMAKE_GENERATOR at
the end of the generator name as it is now. The new option and GUI
updates are really just about simplifying the selection of the
generator and avoiding per-platform global generators in the internal
implementation. Users can either use -G and specify the full
generator name with platform or use -G/-GP separately but either way
the value of CMAKE_GENERATOR will be the same.
This can probably be improved in the future with a new cmake policy
but I don't want to open that can of worms just for WinCE. I think
you can implement -G/-GP such that the values are both stored in the
CMAKE_GENERATOR value. Internally we won't need a separate global
generator for every platform anymore, but that does not change the
public interface.
Thanks,
-Brad
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] conditionals in generator expressions
Brad King wrote: when either nameQual or dirQual is true that is a compile-time constant so the return result line is truly unreachable in that instantiation. Yes. I was assuming a compiler optimization would exist for that kind of thing. You need to use compile-time conditional code rather than runtime tests of compile-time constants. This is true for the other template parameters too. Done. Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
2012/9/17 Brad King brad.k...@kitware.com: On 09/15/2012 04:45 PM, Alexander Neundorf wrote: Also, one of Yury's commit messages says: TODO: remove another clear() because it doesn't delete TargetExports. What is that about? clear() on a vector of TargetExport* does not call delete on each element. BTW, do we really support the reinitialization of all cmake structures? I think that there are quite a few memory leaks in this case. -- Yours Yury, mailto: urkud.ur...@gmail.com -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Proposal: An IRC dev meeting to chat about CMake stuff
Please join us in about 15 minutes for a CMake Developers chat via the IRC #cmake room... -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On Monday 17 September 2012, Brad King wrote: On 09/15/2012 04:45 PM, Alexander Neundorf wrote: There is now a branch export-sets-2 on cmake stage. It cherry-picks a lot of the patches from http://gitorious.org/~urkud1/cmake/urkud-cmake/commits/w/export-set, mostly those from May, and then proceeds a bit differently. In the end, cmake now checks whether a target which is missing in the current export set has been exported and installed exactly once, gets the correct name from that one installation (i.e. the used namespace), and uses that. That simple approach will allow us to move forward with this. If anyone wants multiple exports of the same targets then they can add the explicit export set DEPENDS options later. Cool. The tests are not yet passing, I'll work on this. The topic looks good except for the details below. Additionally it puts the following check in the generated target file: IF(NOT TARGET Foo::foo ) MESSAGE(FATAL_ERROR Required imported target \Foo::foo\ not found ! ) ENDIF() Please review the branch. Exotic cases are not supported, but it should be possible now to export libraries in separate export sets and still have it work. I guess I have to handle the error case better than simply erroring out. Not IMO. Remember my message here: http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/4374/focu s=4386 The user has the option to specify a known-working pkg_DIR value or disable use of the package completely. Your commit message sentence I guess instead of completely erroring out it would be better to only make the find_package() fail. is not needed. I think this is different. Here, in this case, it may fail because the required (missing) package was simply not found, because it is not installed. If the package is optional, this is ok, cmake should not abort, but just report that the package was not found. In the referenced email, if the error occurs, something is broken on the system, a broken package has been installed, or something like that. This is IMO different than simply a missing package. Alex -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On 09/17/2012 03:14 PM, Alexander Neundorf wrote: On Monday 17 September 2012, Brad King wrote: I guess I have to handle the error case better than simply erroring out. Not IMO. Remember my message here: I think this is different. Here, in this case, it may fail because the required (missing) package was simply not found, because it is not installed. I must not understand the use case. It looks to me like you're generating a pkgTargets.cmake file to be loaded by a pkgConfig.cmake file. If these files are being read then pkg_DIR is set to a copy of the pkg. The package has been found. Just as in the previous discussion, the error in the package occurs because it is misconfigured: one of its dependencies is not installed or loaded correctly to provide the other imported target. -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On Monday 17 September 2012, Brad King wrote: On 09/17/2012 03:14 PM, Alexander Neundorf wrote: On Monday 17 September 2012, Brad King wrote: I guess I have to handle the error case better than simply erroring out. Not IMO. Remember my message here: I think this is different. Here, in this case, it may fail because the required (missing) package was simply not found, because it is not installed. I must not understand the use case. It looks to me like you're generating a pkgTargets.cmake file to be loaded by a pkgConfig.cmake file. If these files are being read then pkg_DIR is set to a copy of the pkg. The package has been found. Just as in the previous discussion, the error in the package occurs because it is misconfigured: one of its dependencies is not installed or loaded correctly to provide the other imported target. Let's say FooTargets.cmake provides the target foo. BarTargets.cmake provides the target bar, and requires FooTargets.cmake. Now if the user installed the bar-devel package, but not the foo-devel package, the target foo will not be available. This can or should be checked also outside maybe in the BarConfig.cmake cmake, which could load BarTargets.cmake only if Foo could be found, but still I think it's not necessary to abort in this error case. Alex -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On 09/17/2012 03:35 PM, Alexander Neundorf wrote: Let's say FooTargets.cmake provides the target foo. BarTargets.cmake provides the target bar, and requires FooTargets.cmake. Now if the user installed the bar-devel package, but not the foo-devel package, the target foo will not be available. This can or should be checked also outside maybe in the BarConfig.cmake cmake, which could load BarTargets.cmake only if Foo could be found, but still I think it's not necessary to abort in this error case. What would you do instead of aborting? Silently pretend the package Bar was not found at the current Bar_DIR and move on with the search? That would require the sandboxing I previously elaborated. It would also be confusing to users IMO because the package they know is in their search path would be skipped for a mysterious reason. -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On Monday 17 September 2012, Brad King wrote: On 09/17/2012 03:35 PM, Alexander Neundorf wrote: Let's say FooTargets.cmake provides the target foo. BarTargets.cmake provides the target bar, and requires FooTargets.cmake. Now if the user installed the bar-devel package, but not the foo-devel package, the target foo will not be available. This can or should be checked also outside maybe in the BarConfig.cmake cmake, which could load BarTargets.cmake only if Foo could be found, but still I think it's not necessary to abort in this error case. What would you do instead of aborting? Silently pretend the package Bar was not found at the current Bar_DIR and move on with the search? That would require the sandboxing I previously elaborated. It would also be confusing to users IMO because the package they know is in their search path would be skipped for a mysterious reason. Isn't e.g. FindPNG.cmake doing just the same ? If zlib wasn't found, fail at finding png. Here we are again at generating error messages... Instead of simply stating that a required target does not exist, it could also state from which installed export this is expected to come, e.g. FooTargets.cmake. Alex -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On 09/17/2012 03:52 PM, Alexander Neundorf wrote: On Monday 17 September 2012, Brad King wrote: What would you do instead of aborting? Silently pretend the package Bar was not found at the current Bar_DIR and move on with the search? That would require the sandboxing I previously elaborated. It would also be confusing to users IMO because the package they know is in their search path would be skipped for a mysterious reason. Isn't e.g. FindPNG.cmake doing just the same ? If zlib wasn't found, fail at finding png. Okay, so then BarConfig.cmake would set Bar_FOUND to false to pretend the package isn't found but not change Bar_DIR? Instead of simply stating that a required target does not exist, it could also state from which installed export this is expected to come, e.g. FooTargets.cmake. That would be useful if the namespace doesn't match. -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Proposal: An IRC dev meeting to chat about CMake stuff
David Cole wrote: Please join us in about 15 minutes for a CMake Developers chat via the IRC #cmake room... Here is the log of the meeting. [19:47:56] Dakon ah, the VIPs are finally arriving ;) [19:48:36] *** Modus #cmake +o Dakon durch ChanServ [19:48:47] *** Modus #cmake +v davidcole durch Dakon [19:58:01] davidcole VIP? Where? (looks around… sees nobody else) [19:58:13] Dakon ;) [19:58:26] Dakon aLeSD|: there? [19:59:38] davidcole Can we tell how many are here? I'm not an IRC expert yet by any stretch [20:00:30] wacky I'm here for the developer discussion. [20:00:42] steveire davidcole: 84 people [20:00:49] steveire But it's always about that many [20:00:52] davidcole Excellent, you are in the right place [20:01:28] davidcole This is going to be sort of free form… [20:01:37] davidcole I don't have any specific agenda [20:02:35] davidcole But I would like to talk about CMake 2.8.10, when we should anticipate having release candidate 1, talk a little about bugs, and then see if anybody else has any questions or discussion items [20:04:38] Dakon then let's talk ;) [20:05:50] davidcole OK - first of all, one of the ideas with scheduling this on Monday was to talk about anything you all would like to bring to my attention (and Brad's) before our Tuesday merge sessions. [20:06:20] davidcole Before we talk about 2.8.10-rc1, does anybody have any specific items that they want to chat about w.r.t. tomorrow's merging? [20:06:26] steveire I have an item: Is the qt5-qtdialog-port branch blocked on something? Waiting for Qt 5 relase or something like thaT? [20:06:35] davidcole The dashboard looks good today. [20:06:51] davidcole qt5 question: hang on, let me take a glance at it... [20:07:40] steveire Oops, I just realized I didn't merge it to next... [20:07:44] Dakon I think I finally fixed the last issue in the document-MSVC- variables-12567 branch, should be green tomorrow [20:07:48] davidcole The qt5-qtdialog-port is not merged to 'next' according to 'stage print' [20:08:11] davidcole One of these times I'll look up to see what others have typed before I hit return :-P [20:08:21] Dakon hrhr [20:08:40] Dakon I have a fix in bug 13262 but got no response from the original reporter so far [20:08:41] davidcole great on the fixing last issue - thanks, Eike [20:09:16] Dakon I think I'll just push and merge that to next now and let everyone complain afterwards about the things I broke again ;) [20:09:16] davidcole well…. [20:09:29] steveire Merged the qt5 branch to next now. [20:09:40] davidcole w.r.t. 13262, if you don't hear back, but you think it's probably the right fix, it's ok with me if you want to merge it to 'next' [20:10:08] davidcole the patch for it looks simple enough [20:10:42] Dakon I think I once again will run into problems there is the list is empty, no? [20:10:58] Dakon will check and then merge [20:11:39] Dakon ah, no, the list can't be empty there [20:12:11] Dakon but I'll change that set to list(APPEND for sanity [20:12:31] davidcole sounds reasonable [20:12:42] davidcole there are other not yet in next [20:12:48] davidcole branches on the stage [20:13:17] davidcole any claimers? for export-sets-2 generate_export_header-fixes and AutomocUseTargetProperties [20:13:36] davidcole will they be in 'next' soon? Or is the stage being used as a communications channel for these topics? [20:14:01] Dakon the second one sounds like steveire ;) [20:14:03] steveire generate_export_header-fixes is mine. I'll try to come back to it soon [20:14:24] steveire The last time I merged it, the dashboard blushed. [20:14:37] davidcole It was embarrassed for you? [20:14:38] davidcole '-) [20:14:40] davidcole ;-) [20:14:59] davidcole Looks like export-sets-2 is Alex's [20:15:00] steveire :) [20:15:18] steveire Yes, that's under discussion on the ml atm. [20:15:22] Dakon someone could have noticed that I messed up the argument order to list(FIND) in that patch [20:15:30] steveire http://public.kitware.com/Bug/view.php?id493#c30781 relates to the third one. [20:15:31] davidcole And so is the other one (also Alex's) [20:15:58] davidcole Dang, do I have to look up the --help-command for list everytime? [20:16:45] Dakon hehe ;) [20:17:01] Dakon why should it be simpler for you than for me, hm? ;) [20:17:08] davidcole All right, so it sounds like things are fairly well in hand for topics already in 'next' and topics coming soon on the stage [20:17:53] Dakon I would like if Brad could go and cherry-pick that kwsys stuff from VTK he talked about [20:17:58] davidcole Assuming the dashboards look good tomorrow, Brad and I will review them all and hopefully push most or all of them to master [20:18:26] davidcole I will mention the kwsys/VTK item to him [20:20:33] Dakon can someone try to load one of the Windows machines with a bunch of open source projects? [20:21:04] Dakon I fear that most Find modules are not tested on windows at all and will explode once someone will test them [20:22:00] davidcole What do you mean by load
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On Monday 17 September 2012, Brad King wrote: On 09/15/2012 04:45 PM, Alexander Neundorf wrote: There is now a branch export-sets-2 on cmake stage. It cherry-picks a lot of the patches from http://gitorious.org/~urkud1/cmake/urkud-cmake/commits/w/export-set, mostly those from May, and then proceeds a bit differently. In the end, cmake now checks whether a target which is missing in the current export set has been exported and installed exactly once, gets the correct name from that one installation (i.e. the used namespace), and uses that. That simple approach will allow us to move forward with this. If anyone wants multiple exports of the same targets then they can add the explicit export set DEPENDS options later. The topic looks good except for the details below. How should the APPEND mode of EXPORT() be handled ? Could you please have a look at cmExportFileGenerator::SetImportLinkProperty(..) whether this looks ok ? Alex -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On Mon, Sep 17, 2012 at 4:35 PM, Alexander Neundorf neund...@kde.org wrote: How should the APPEND mode of EXPORT() be handled ? Could you please have a look at cmExportFileGenerator::SetImportLinkProperty(..) whether this looks ok ? The APPEND mode used to mean the project is on its own to handle dependencies. I guess it can get the target from another export if it is already there but otherwise not produce any error. -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Proposal: An IRC dev meeting to chat about CMake stuff
Hi, sorry, I totally forgot about the IRC meeting. On Monday 17 September 2012, Rolf Eike Beer wrote: 20:13:17] davidcole any claimers? for export-sets-2 Working on it right now. generate_export_header-fixes and AutomocUseTargetProperties Oh, I haven't merged that to next yet ? Will do so. [20:37:59] davidcole We have about 30-something on the roadmap [20:38:05] davidcole and I doubt we'll get to them all [20:38:18] davidcole we have fixed 24 according to the change log page since Aug. 9th Yes, I was hoping to be able to fix the remaining open Eclipse-related bugs, but except one they are all due to issues inside Eclipse :-/ Alex -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On Monday 17 September 2012, Alexander Neundorf wrote: On Monday 17 September 2012, Brad King wrote: On 09/15/2012 04:45 PM, Alexander Neundorf wrote: There is now a branch export-sets-2 on cmake stage. It cherry-picks a lot of the patches from http://gitorious.org/~urkud1/cmake/urkud-cmake/commits/w/export-set, mostly those from May, and then proceeds a bit differently. In the end, cmake now checks whether a target which is missing in the current export set has been exported and installed exactly once, gets the correct name from that one installation (i.e. the used namespace), and uses that. That simple approach will allow us to move forward with this. If anyone wants multiple exports of the same targets then they can add the explicit export set DEPENDS options later. Cool. The tests are not yet passing, I'll work on this. The tests are passing now. I had to change the order how the target files are included in the test, so that the required targets already exist when the other targets are set up. I pushed that to stage too. I think basically we're back to generating useful error messages again... Alex -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] License agreement in package installation
Hi, I need to add an interfactive license agreement to an RPM package when it is installed in Linux terminal (not GUI), it should display the license and asked whether the user agree or not. I noticed from cmake 2.8.8 document there is CPACK_RESOURCE_FILE_LICENSE may produce such process, am I right? If I am wrong, how can I make it work with cmake / cpack? Thank you. Kind regards, Jupiter -- View this message in context: http://cmake.3232098.n2.nabble.com/License-agreement-in-package-installation-tp7581672.html Sent from the CMake mailing list archive at Nabble.com. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] ctest submission timeout
Hi all, I am running a dashboard on a system which I suspect has periodically high network loads leading to the more than occasional ctest submission timeout(ex below). Is it possible to tell ctest to retry or adjust the timeout value? Thanks Burlen Error when uploading file: /usr/common/graphics/ParaView/dashboards/openmpi-py-osmesa/ParaView-build/Testing/20120917-0100/Test.xml Error message was: Operation too slow. Less than 1 bytes/sec transfered the last 120 seconds Problems when submitting via HTTP -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] ctest submission timeout
See the RETRY_DELAY and RETRY_COUNT parameters to ctest_submit: http://www.cmake.org/cmake/help/v2.8.9/ctest.html#command:ctest_submit On Mon, Sep 17, 2012 at 11:16 AM, burlen burlen.lor...@gmail.com wrote: Hi all, I am running a dashboard on a system which I suspect has periodically high network loads leading to the more than occasional ctest submission timeout(ex below). Is it possible to tell ctest to retry or adjust the timeout value? Thanks Burlen Error when uploading file: /usr/common/graphics/ParaView/dashboards/openmpi-py-osmesa/ParaView-build/Testing/20120917-0100/Test.xml Error message was: Operation too slow. Less than 1 bytes/sec transfered the last 120 seconds Problems when submitting via HTTP -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] ctest submission timeout
Great! Thanks Burlen On 09/17/2012 08:26 AM, David Cole wrote: See the RETRY_DELAY and RETRY_COUNT parameters to ctest_submit: http://www.cmake.org/cmake/help/v2.8.9/ctest.html#command:ctest_submit On Mon, Sep 17, 2012 at 11:16 AM, burlenburlen.lor...@gmail.com wrote: Hi all, I am running a dashboard on a system which I suspect has periodically high network loads leading to the more than occasional ctest submission timeout(ex below). Is it possible to tell ctest to retry or adjust the timeout value? Thanks Burlen Error when uploading file: /usr/common/graphics/ParaView/dashboards/openmpi-py-osmesa/ParaView-build/Testing/20120917-0100/Test.xml Error message was: Operation too slow. Less than 1 bytes/sec transfered the last 120 seconds Problems when submitting via HTTP -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] License agreement in package installation
2012/9/17 hce jupiter@gmail.com: Hi, I need to add an interfactive license agreement to an RPM package when it is installed in Linux terminal (not GUI), it should display the license and asked whether the user agree or not. I noticed from cmake 2.8.8 document there is CPACK_RESOURCE_FILE_LICENSE may produce such process, am I right? This is the right way to do it but... If I am wrong, how can I make it work with cmake / cpack? This is not supported by CPack RPM, we could include the license text file as a %doc file but.. ..it is usually a bad idea to include interactivity (i.e. install time question) in an RPM, because most of the time no-one will be there to answer it: http://stackoverflow.com/questions/2132828/adding-license-agreement-in-rpm-package (see licensing guidelines of RPM based distros as well: http://fedoraproject.org/wiki/Packaging/LicensingGuidelines http://wiki.mandriva.com/en/Policies/Licensing) On Debian dpkg sometimes ask question but there is a mean to avoid them of provide default answers in a 'non-interactive' way: http://serverfault.com/questions/84521/automate-dpkg-reconfigure-tzdata That said, with CPackRPM you may use CPACK_RPM_PRE_INSTALL_SCRIPT_FILE see: cpack --help-variable CPACK_RPM_PRE_INSTALL_SCRIPT_FILE in order to launch a pre-install script that may ask a question. An appropriate alternative would be to pop-up the license agreement at some other point: - Before downloading the RPM - On the first run of the installed software - ... -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] CMake/Ninja support in Qt Creator
Qt Creator 2.6 is beta now. On github I've uploaded a patched version with Ninja support for CMake based projects: https://github.com/syntheticpp/qt-creator/downloads When CDB is installed http://doc-snapshot.qt-project.org/qtcreator-2.5/creator-debugger-engines.html#supported-cdb-versions debugging works even with the 32bit/64bit compilers of Visual Studio Express 2012. Currently I'm trying to bring the patches upstream, but for 2.6 it seems too late. Peter -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Visual Studio 2012 Express for WD and cmake 2.8.9
Hi,
I just installed the Visual Studio 2012 Express edition for Windows Desktop
and cmake 2.8.9 is having some issues with it. Initially when I ran the
cmake configure step it failed to find the devenv or msbuild program:
CMake was unable to find a build program corresponding to Visual Studio
11. CMAKE_MAKE_PROGRAM is not set. You probably need to select a different
build tool.
I then edited the CMakeVS11FindMake.cmake file to tell it to use the same
MSBuild that the VS2012 command prompt uses
(C:/Windows/Microsoft.NET/Framework/v4.0.30319):
IF(NOT CMAKE_CROSSCOMPILING)
FIND_PROGRAM(CMAKE_MAKE_PROGRAM
NAMES MSBuild
HINTS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VS;ProductDir]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\WDExpress\\11.0\\Setup\\VS;ProductDir]
$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;CLR
Version]/
c:/WINDOWS/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;CLR
Version]/
$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\11.0;CLR
Version]/
C:/Windows/Microsoft.NET/Framework/v4.0.30319
)
ENDIF()
and that gets me a bit further. The error message is now:
Check for working C compiler using: Visual Studio 11
Check for working C compiler using: Visual Studio 11 -- works
Detecting C compiler ABI info
CMake Error at C:/Program Files (x86)/CMake
2.8.9/share/cmake-2.8/Modules/CMakeDetermineCompilerABI.cmake:31
(TRY_COMPILE):
Cannot copy output executable
''
to destination specified by COPY_FILE:
'C:/data/perforceCheckouts/sim/vxe/diamond/DEV/glenn.coombs/cmake/CMakeFiles/CMakeDetermineCompilerABI_C.bin'
Unable to find the executable at any of:
C:/data/perforceCheckouts/sim/vxe/diamond/DEV/glenn.coombs/cmake/CMakeFiles/CMakeTmp/cmTryCompileExec66551527.exe
C:/data/perforceCheckouts/sim/vxe/diamond/DEV/glenn.coombs/cmake/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec66551527.exe
C:/data/perforceCheckouts/sim/vxe/diamond/DEV/glenn.coombs/cmake/CMakeFiles/CMakeTmp/Development/cmTryCompileExec66551527.exe
Call Stack (most recent call first):
C:/Program Files (x86)/CMake
2.8.9/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake:71
(CMAKE_DETERMINE_COMPILER_ABI)
CMakeLists.txt:3 (project)
Is it possible to hack an existing cmake 2.8.9 install to work with VS2012
Express or am I going to have to wait for cmake 2.8.10 ?
--
Glenn
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] License agreement in package installation
Hi, On Mon, Sep 17, 2012 at 12:00:03PM -0400, cmake-requ...@cmake.org wrote: Date: Mon, 17 Sep 2012 04:59:28 -0700 (PDT) From: hce jupiter@gmail.com Subject: [CMake] License agreement in package installation To: cmake@cmake.org Message-ID: 1347883168204-7581672.p...@n2.nabble.com Content-Type: text/plain; charset=us-ascii Hi, I need to add an interfactive license agreement to an RPM package when it is installed in Linux terminal (not GUI), it should display the license and asked whether the user agree or not. I noticed from cmake 2.8.8 document there is CPACK_RESOURCE_FILE_LICENSE may produce such process, am I right? If I am wrong, how can I make it work with cmake / cpack? You don't. ;) (as quoted from http://stackoverflow.com/questions/1797455/how-to-put-license-agreement-in-spec-file-rpm ) Eric mentioned another stackoverflow URL, too. Note that shell archive (shar-style) package generators (STGZ, STBZ2 etc.) do have a license acknowledge step, though. If you do feel the urge to add this to an explicitly automation-capable mechanism (e.g. RPM), then definitely make sure to check for non-interactive shell environment, as Eric said. Philosophically spoken you could say that since you need to prevent non-interactive installs from getting blocked, this means that one user group will be prompted, whereas another user group (with installation carried out automatically) will not have any license acknowledgement step. IOW, this strongly hints at RPM install step being the wrong place to do such things. HTH, Andreas Mohr -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] License agreement in package installation
Thanks Eric and Andreas. On 9/18/12, Eric Noulard eric.noul...@gmail.com wrote: 2012/9/17 hce jupiter@gmail.com: Hi, I need to add an interfactive license agreement to an RPM package when it is installed in Linux terminal (not GUI), it should display the license and asked whether the user agree or not. I noticed from cmake 2.8.8 document there is CPACK_RESOURCE_FILE_LICENSE may produce such process, am I right? This is the right way to do it but... If I am wrong, how can I make it work with cmake / cpack? This is not supported by CPack RPM, we could include the license text file as a %doc file but.. ..it is usually a bad idea to include interactivity (i.e. install time question) in an RPM, because most of the time no-one will be there to answer it: http://stackoverflow.com/questions/2132828/adding-license-agreement-in-rpm-package (see licensing guidelines of RPM based distros as well: http://fedoraproject.org/wiki/Packaging/LicensingGuidelines http://wiki.mandriva.com/en/Policies/Licensing) On Debian dpkg sometimes ask question but there is a mean to avoid them of provide default answers in a 'non-interactive' way: http://serverfault.com/questions/84521/automate-dpkg-reconfigure-tzdata That said, with CPackRPM you may use CPACK_RPM_PRE_INSTALL_SCRIPT_FILE see: cpack --help-variable CPACK_RPM_PRE_INSTALL_SCRIPT_FILE in order to launch a pre-install script that may ask a question. An appropriate alternative would be to pop-up the license agreement at some other point: - Before downloading the RPM - On the first run of the installed software - ... -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] CPack source distribution recursing out of control
Hi, I'm not sure what I'm doing wrong, but when I run cpack --config CPackSourceConfig.cmake -G TGZ, the operation runs forever and produces archives on the order of dozens of gigabytes. As far as cpack goes, I don't have much specified other than include(cpack) and the version variables. I do have include(InstallRequiredSystemLibraries) as well, but that's pretty much it. I did some investigation, and the problem was pretty easy to spot. Inside the generated _CPack* directory was the installed source directory, which in turn had a nested copy of the same source directory, etc, down many, many levels, so that many gigabytes of disc space were consumed. I'm sorry if this isn't specific enough, but does anyone know what's going on? Thanks, --Jack -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, master, updated. v2.8.9-300-g70169ec
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 70169ec1bfa5adc4bc99c1777f44c6f8446bba04 (commit) from 4824633642bbaacf6c5b7b36e131e2463d7c2f68 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70169ec1bfa5adc4bc99c1777f44c6f8446bba04 commit 70169ec1bfa5adc4bc99c1777f44c6f8446bba04 Author: Kitware Robot kwro...@kitware.com AuthorDate: Mon Sep 17 00:01:07 2012 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Mon Sep 17 00:01:07 2012 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a88a2d4..4f37280 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 9) -set(CMake_VERSION_TWEAK 20120916) +set(CMake_VERSION_TWEAK 20120917) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-551-g2258ae0
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project CMake.
The branch, next has been updated
via 2258ae07deaca0338911f8b548cf6c6ef023a026 (commit)
via f34321a02d157a5d613874fc4dfd70b3df3d14b3 (commit)
from 51d6a1737bd8af432da7a586169245c2b9c58b63 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2258ae07deaca0338911f8b548cf6c6ef023a026
commit 2258ae07deaca0338911f8b548cf6c6ef023a026
Merge: 51d6a17 f34321a
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Sep 17 08:56:58 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 17 08:56:58 2012 -0400
Merge topic 'vs-simplify-CreateLocalGenerator' into next
f34321a VS: Remove duplicated implementations of CreateLocalGenerator()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f34321a02d157a5d613874fc4dfd70b3df3d14b3
commit f34321a02d157a5d613874fc4dfd70b3df3d14b3
Author: Patrick Gansterer par...@paroga.com
AuthorDate: Fri Sep 14 11:16:43 2012 +0200
Commit: Patrick Gansterer par...@paroga.com
CommitDate: Fri Sep 14 12:42:31 2012 +0200
VS: Remove duplicated implementations of CreateLocalGenerator()
The IA64 and Win64 versions of the VS8 and VS9 generators
contain the same code for this function as in the base class.
diff --git a/Source/cmGlobalVisualStudio8Win64Generator.cxx
b/Source/cmGlobalVisualStudio8Win64Generator.cxx
index 60e45b8..164d116 100644
--- a/Source/cmGlobalVisualStudio8Win64Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Win64Generator.cxx
@@ -22,17 +22,6 @@
cmGlobalVisualStudio8Win64Generator::cmGlobalVisualStudio8Win64Generator()
this-ArchitectureId = x64;
}
-///! Create a local generator appropriate to this Global Generator
-cmLocalGenerator *cmGlobalVisualStudio8Win64Generator::CreateLocalGenerator()
-{
- cmLocalVisualStudio7Generator *lg
-= new cmLocalVisualStudio7Generator(cmLocalVisualStudioGenerator::VS8);
- lg-SetPlatformName(this-GetPlatformName());
- lg-SetExtraFlagTable(this-GetExtraFlagTableVS8());
- lg-SetGlobalGenerator(this);
- return lg;
-}
-
//
void cmGlobalVisualStudio8Win64Generator
::GetDocumentation(cmDocumentationEntry entry) const
diff --git a/Source/cmGlobalVisualStudio8Win64Generator.h
b/Source/cmGlobalVisualStudio8Win64Generator.h
index 136cdb8..12f8012 100644
--- a/Source/cmGlobalVisualStudio8Win64Generator.h
+++ b/Source/cmGlobalVisualStudio8Win64Generator.h
@@ -38,9 +38,6 @@ public:
/** Get the documentation entry for this generator. */
virtual void GetDocumentation(cmDocumentationEntry entry) const;
- ///! create the correct local generator
- virtual cmLocalGenerator *CreateLocalGenerator();
-
/**
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
diff --git a/Source/cmGlobalVisualStudio9IA64Generator.cxx
b/Source/cmGlobalVisualStudio9IA64Generator.cxx
index 993340a..38dbfac 100644
--- a/Source/cmGlobalVisualStudio9IA64Generator.cxx
+++ b/Source/cmGlobalVisualStudio9IA64Generator.cxx
@@ -19,17 +19,6 @@
cmGlobalVisualStudio9IA64Generator::cmGlobalVisualStudio9IA64Generator()
this-ArchitectureId = Itanium;
}
-///! Create a local generator appropriate to this Global Generator
-cmLocalGenerator *cmGlobalVisualStudio9IA64Generator::CreateLocalGenerator()
-{
- cmLocalVisualStudio7Generator *lg =
-new cmLocalVisualStudio7Generator(cmLocalVisualStudioGenerator::VS9);
- lg-SetPlatformName(this-GetPlatformName());
- lg-SetExtraFlagTable(this-GetExtraFlagTableVS8());
- lg-SetGlobalGenerator(this);
- return lg;
-}
-
//
void cmGlobalVisualStudio9IA64Generator
::GetDocumentation(cmDocumentationEntry entry) const
diff --git a/Source/cmGlobalVisualStudio9IA64Generator.h
b/Source/cmGlobalVisualStudio9IA64Generator.h
index e33ee15..989b0d1 100644
--- a/Source/cmGlobalVisualStudio9IA64Generator.h
+++ b/Source/cmGlobalVisualStudio9IA64Generator.h
@@ -38,9 +38,6 @@ public:
/** Get the documentation entry for this generator. */
virtual void GetDocumentation(cmDocumentationEntry entry) const;
- ///! create the correct local generator
- virtual cmLocalGenerator *CreateLocalGenerator();
-
/**
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
diff --git a/Source/cmGlobalVisualStudio9Win64Generator.cxx
b/Source/cmGlobalVisualStudio9Win64Generator.cxx
index 08f537d..4d8a646 100644
--- a/Source/cmGlobalVisualStudio9Win64Generator.cxx
+++
[Cmake-commits] CMake branch, next, updated. v2.8.9-554-gd36a52b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project CMake.
The branch, next has been updated
via d36a52b1202b9603729bc3a946f893c472ea1101 (commit)
via 7369a8faee40574e7f87eeaa5e7718d0da407ffe (commit)
via 131d91a1f91116e85281d11d175290fdb211f664 (commit)
from 2258ae07deaca0338911f8b548cf6c6ef023a026 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d36a52b1202b9603729bc3a946f893c472ea1101
commit d36a52b1202b9603729bc3a946f893c472ea1101
Merge: 2258ae0 7369a8f
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Sep 17 09:14:44 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 17 09:14:44 2012 -0400
Merge topic 'cleanup-TLS-and-SSL-interface' into next
7369a8f file(DOWNLOAD): Make TLS options behave as documented
131d91a Rename SSL terminology to TLS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7369a8faee40574e7f87eeaa5e7718d0da407ffe
commit 7369a8faee40574e7f87eeaa5e7718d0da407ffe
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Sep 14 15:57:18 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Sep 17 09:03:45 2012 -0400
file(DOWNLOAD): Make TLS options behave as documented
The logic added in commit e1c89f08 (file(DOWNLOAD): Add options for SSL,
2012-08-21) did not actually provide the documented behavior. Simplify
the implementation to read the variable values first and then replace
them with the explicit argument values if encountered. Always set the
curl option CURLOPT_SSL_VERIFYPEER to either on or off explicitly
instead of depending on the curl default behavior.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 1cb2ece..4d9eb79 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2667,9 +2667,8 @@
cmFileCommand::HandleDownloadCommand(std::vectorstd::string const args)
long inactivity_timeout = 0;
std::string verboseLog;
std::string statusVar;
- std::string caFile;
- bool checkTLS = false;
- bool verifyTLS = false;
+ bool tls_verify = this-Makefile-IsOn(CMAKE_TLS_VERIFY);
+ const char* cainfo = this-Makefile-GetDefinition(CMAKE_TLS_CAINFO);
std::string expectedHash;
std::string hashMatchMSG;
cmsys::auto_ptrcmCryptoHash hash;
@@ -2728,8 +2727,7 @@
cmFileCommand::HandleDownloadCommand(std::vectorstd::string const args)
++i;
if(i != args.end())
{
-verifyTLS = cmSystemTools::IsOn(i-c_str());
-checkTLS = true;
+tls_verify = cmSystemTools::IsOn(i-c_str());
}
else
{
@@ -2742,7 +2740,7 @@
cmFileCommand::HandleDownloadCommand(std::vectorstd::string const args)
++i;
if(i != args.end())
{
-caFile = *i;
+cainfo = i-c_str();
}
else
{
@@ -2866,37 +2864,19 @@
cmFileCommand::HandleDownloadCommand(std::vectorstd::string const args)
check_curl_result(res, DOWNLOAD cannot set debug function: );
// check to see if TLS verification is requested
- const char* verifyValue =
-this-Makefile-GetDefinition(CMAKE_TLS_VERIFY);
- // if there is a cmake variable or if the command has TLS_VERIFY requested
- if(verifyValue || checkTLS)
+ if(tls_verify)
{
-// the args to the command come first
-bool verify = verifyTLS;
-if(!verify verifyValue)
- {
- verify = cmSystemTools::IsOn(verifyValue);
- }
-if(verify)
- {
- res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1);
- check_curl_result(res, Unable to set TLS/SSL Verify on: );
- }
-else
- {
- res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
- check_curl_result(res, Unable to set TLS/SSL Verify off: );
- }
+res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1);
+check_curl_result(res, Unable to set TLS/SSL Verify on: );
}
- // check to see if a CAINFO file has been specified
- const char* cainfo =
-this-Makefile-GetDefinition(CMAKE_TLS_CAINFO);
- // command arg comes first
- if(caFile.size())
+ else
{
-cainfo = caFile.c_str();
+res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
+check_curl_result(res, Unable to set TLS/SSL Verify off: );
}
- if(cainfo)
+ // check to see if a CAINFO file has been specified
+ // command arg comes first
+ if(cainfo *cainfo)
{
res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cainfo);
check_curl_result(res, Unable to set TLS/SSL Verify CAINFO: );
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=131d91a1f91116e85281d11d175290fdb211f664
commit
[Cmake-commits] CMake branch, next, updated. v2.8.9-558-gb62d020
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project CMake.
The branch, next has been updated
via b62d0206541b326a5e8a5c5a05134927efbeafc0 (commit)
via 47aef4b48c067b2d30ea81e1ae8650573683753c (commit)
from 33d81a51278de8d2b45c566d901c680330ce4b2c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b62d0206541b326a5e8a5c5a05134927efbeafc0
commit b62d0206541b326a5e8a5c5a05134927efbeafc0
Merge: 33d81a5 47aef4b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Sep 17 11:27:16 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 17 11:27:16 2012 -0400
Merge topic 'generator-expression-refactor' into next
47aef4b Remove the hadError from the result creator.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47aef4b48c067b2d30ea81e1ae8650573683753c
commit 47aef4b48c067b2d30ea81e1ae8650573683753c
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Sep 17 17:23:53 2012 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Mon Sep 17 17:26:07 2012 +0200
Remove the hadError from the result creator.
It is not needed, given that the context already stores that
information.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 0dd8ac1..acc844a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -185,8 +185,7 @@ struct TargetFilesystemArtifactResultCreator
{
static std::string Create(cmTarget* target,
cmGeneratorExpressionContext *context,
-const GeneratorExpressionContent *content,
-bool hadError);
+const GeneratorExpressionContent *content);
};
//
@@ -195,8 +194,7 @@ struct TargetFilesystemArtifactResultCreatorfalse, true
{
static std::string Create(cmTarget* target,
cmGeneratorExpressionContext *context,
-const GeneratorExpressionContent *content,
-bool *hadError)
+const GeneratorExpressionContent *content)
{
// The target soname file (.so.1).
if(target-IsDLLPlatform())
@@ -204,7 +202,6 @@ struct TargetFilesystemArtifactResultCreatorfalse, true
::reportError(context, content-GetOriginalExpression(),
TARGET_SONAME_FILE is not allowed
for DLL target platforms.);
- *hadError = true;
return std::string();
}
if(target-GetType() != cmTarget::SHARED_LIBRARY)
@@ -212,7 +209,6 @@ struct TargetFilesystemArtifactResultCreatorfalse, true
::reportError(context, content-GetOriginalExpression(),
TARGET_SONAME_FILE is allowed only for
SHARED libraries.);
- *hadError = true;
return std::string();
}
std::string result = target-GetDirectory(context-Config);
@@ -228,8 +224,7 @@ struct TargetFilesystemArtifactResultCreatortrue, false
{
static std::string Create(cmTarget* target,
cmGeneratorExpressionContext *context,
-const GeneratorExpressionContent *content,
-bool *hadError)
+const GeneratorExpressionContent *content)
{
// The file used to link to the target (.so, .lib, .a).
if(!target-IsLinkable())
@@ -237,7 +232,6 @@ struct TargetFilesystemArtifactResultCreatortrue, false
::reportError(context, content-GetOriginalExpression(),
TARGET_LINKER_FILE is allowed only for libraries and
executables with ENABLE_EXPORTS.);
- *hadError = true;
return std::string();
}
return target-GetFullPath(context-Config,
@@ -251,8 +245,7 @@ struct TargetFilesystemArtifactResultCreatorfalse, false
{
static std::string Create(cmTarget* target,
cmGeneratorExpressionContext *context,
-const GeneratorExpressionContent *,
-bool *)
+const GeneratorExpressionContent *)
{
return target-GetFullPath(context-Config, false, true);
}
@@ -329,14 +322,12 @@ struct TargetFilesystemArtifact : public
cmGeneratorExpressionNode
}
context-Targets.insert(target);
-bool hadError;
std::string result =
TargetFilesystemArtifactResultCreatorlinker, soname::Create(
target,
[Cmake-commits] CMake branch, next, updated. v2.8.9-569-g396e5c9
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project CMake.
The branch, next has been updated
via 396e5c90604db53751e6618790e1e1036ec6414e (commit)
via 25a4f5675490d9311db271942ecd1781de5f3558 (commit)
via 717f31a877e701b801043b893c97f4a186f93739 (commit)
via 066e85893ffa3492e4247e59a80ee1de67babef5 (commit)
via 430ba9faef26d66e2fb3ffb938122b62f627562d (commit)
via 32a572564a94380a543593f9568d34fc2c4a8b70 (commit)
via 0b6625c605b95ef7e936717e946906d422d3d4f7 (commit)
via 8ab312b6930c52a8f04688d8834383be4f09f5d5 (commit)
via bd728f6feeab10db189e82d3100c9df9ee64ad5c (commit)
from 3631f51cec4dd13a4bb1787976408768bf955daa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=396e5c90604db53751e6618790e1e1036ec6414e
commit 396e5c90604db53751e6618790e1e1036ec6414e
Merge: 3631f51 25a4f56
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Sep 17 14:08:59 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 17 14:08:59 2012 -0400
Merge topic 'qt5-qtdialog-port' into next
25a4f56 Build with Qt5 if it is found.
717f31a Compile with both Qt4 and Qt5.
066e858 Replace two include_directories with a setting.
430ba9f Use add_subdirectory instead of the obsolete subdirs.
32a5725 Remove an if which is always true.
0b6625c Move variable setting down to where it relates to.
8ab312b Use CMake platform variables instead of Qt ones.
bd728f6 Add a return-after-error if an old Qt is found.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25a4f5675490d9311db271942ecd1781de5f3558
commit 25a4f5675490d9311db271942ecd1781de5f3558
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Feb 23 12:40:38 2012 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Aug 22 12:58:43 2012 +0200
Build with Qt5 if it is found.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 51e61d0..a1ffa20 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -9,16 +9,33 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=
+
project(QtDialog)
-set(QT_MIN_VERSION 4.4.0)
-find_package(Qt4 REQUIRED)
+find_package(Qt5Widgets QUIET)
+if (Qt5Widgets_FOUND)
+ include_directories(${Qt5Widgets_INCLUDE_DIRS})
+ add_definitions(${Qt5Widgets_DEFINITONS})
+ macro(qt4_wrap_ui)
+qt5_wrap_ui(${ARGN})
+ endmacro()
+ macro(qt4_wrap_cpp)
+qt5_wrap_cpp(${ARGN})
+ endmacro()
+ macro(qt4_add_resources)
+qt5_add_resources(${ARGN})
+ endmacro()
+ set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
+else()
+ set(QT_MIN_VERSION 4.4.0)
+ find_package(Qt4 REQUIRED)
+ if(NOT QT4_FOUND)
+message(SEND_ERROR Failed to find Qt 4.4 or greater.)
+return()
+ endif()
-if(NOT QT4_FOUND)
- message(SEND_ERROR Failed to find Qt 4.4 or greater.)
- return()
+ include(${QT_USE_FILE})
endif()
-include(${QT_USE_FILE})
set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=717f31a877e701b801043b893c97f4a186f93739
commit 717f31a877e701b801043b893c97f4a186f93739
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Feb 23 12:35:53 2012 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 21 13:36:51 2012 +0200
Compile with both Qt4 and Qt5.
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index a2b1567..0d01181 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -348,7 +348,11 @@ void QCMake::interrupt()
bool QCMake::interruptCallback(void* cd)
{
QCMake* self = reinterpret_castQCMake*(cd);
+#if QT_VERSION QT_VERSION_CHECK(5, 0, 0)
return self-InterruptFlag;
+#else
+ return self-InterruptFlag.load();
+#endif
}
void QCMake::progressCallback(const char* msg, float percent, void* cd)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=066e85893ffa3492e4247e59a80ee1de67babef5
commit 066e85893ffa3492e4247e59a80ee1de67babef5
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Aug 17 20:25:51 2012 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 21 13:36:26 2012 +0200
Replace two include_directories with a setting.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 1eaa8dc..51e61d0 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -66,8 +66,7 @@ if(APPLE)
MACOSX_PACKAGE_LOCATION Resources)
endif()
[Cmake-commits] CMake branch, next, updated. v2.8.9-571-gfed487b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project CMake.
The branch, next has been updated
via fed487bc2081748c3cc15352604b34c1c2e17e58 (commit)
via adf705863c0ccfe0b688aa615c306836caa9687f (commit)
from 396e5c90604db53751e6618790e1e1036ec6414e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fed487bc2081748c3cc15352604b34c1c2e17e58
commit fed487bc2081748c3cc15352604b34c1c2e17e58
Merge: 396e5c9 adf7058
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Mon Sep 17 14:30:25 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 17 14:30:25 2012 -0400
Merge topic 'findsdl-unlimited-main-13262' into next
adf7058 FindSDL: add SDLMAIN_LIBRARY only once (#13262)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adf705863c0ccfe0b688aa615c306836caa9687f
commit adf705863c0ccfe0b688aa615c306836caa9687f
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Sun Sep 9 16:08:45 2012 +0200
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Mon Sep 17 20:29:29 2012 +0200
FindSDL: add SDLMAIN_LIBRARY only once (#13262)
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index 487c5d3..adaec95 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -133,10 +133,12 @@ endif()
if(SDL_LIBRARY_TEMP)
# For SDLmain
- if(NOT SDL_BUILDING_LIBRARY)
-if(SDLMAIN_LIBRARY)
- set(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
+ if(SDLMAIN_LIBRARY AND NOT SDL_BUILDING_LIBRARY)
+list(FIND SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} _SDL_MAIN_INDEX)
+if(_SDL_MAIN_INDEX EQUAL -1)
+ list(APPEND SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY})
endif()
+unset(_SDL_MAIN_INDEX)
endif()
# For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
---
Summary of changes:
Modules/FindSDL.cmake |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
