Re: [cmake-developers] Request to review topic codelite-ide-generator
Hello CMake devs, At what stage is it OK to go ahead and merge codeite-ide-generator topic to the next branch as described by the wiki: http://www.cmake.org/Wiki/CMake/Git/Develop#Merge_a_Topic_for_Testing ? Or can I go ahead and merge it for testing? Thanks, Eran On Mon, Jan 6, 2014 at 9:22 PM, Eran Ifrah eran.if...@gmail.com wrote: Hi Nils, the changes you suggested are now pushed (git is back online and working) Eran On Sat, Jan 4, 2014 at 8:31 PM, Nils Gladitz nilsglad...@gmail.comwrote: Hello again :) I'd remove -j from the ninja invocation since ninja itself already uses its own default value based on CPU count. I'd also remove or replace Additionally a hierarchy of makefiles is generated [...] in the documentation. When using ninja the input files are only generated in the root build directory. Nils On 04.01.2014 18:48, Eran Ifrah wrote: Hi, I have added support for CodeLite IDE (topic name: codeite-ide-generator) If any of the developers can review it - it will be great P.S: This topic is related to this Mantis bug feature request: http://public.kitware.com/Bug/view.php?id=9901 Thanks! -- Eran Ifrah Author of codelite, a cross platform open source C/C++ IDE: http://www.codelite.org wxCrafter, a wxWidgets RAD: http://wxcrafter.codelite.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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers -- Eran Ifrah Author of codelite, a cross platform open source C/C++ IDE: http://www.codelite.org wxCrafter, a wxWidgets RAD: http://wxcrafter.codelite.org -- Eran Ifrah Author of codelite, a cross platform open source C/C++ IDE: http://www.codelite.org wxCrafter, a wxWidgets RAD: http://wxcrafter.codelite.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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014690]: CheckTypeSize doesn't behave as documented in daily build
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=14690 == Reported By:Arunmozhi Assigned To: == Project:CMake Issue ID: 14690 Category: CMake Reproducibility:always Severity: major Priority: normal Status: new == Date Submitted: 2014-01-09 08:45 EST Last Modified: 2014-01-09 08:45 EST == Summary:CheckTypeSize doesn't behave as documented in daily build Description: According to the documentation of CheckTypeSize ... If the BUILTIN_TYPES_ONLY option is not given, the macro checks for headers sys/types.h, stdint.h, and stddef.h, and saves results in HAVE_SYS_TYPES_H, HAVE_STDINT_H, and HAVE_STDDEF_H. The type size check automatically includes the available headers, thus supporting checks of types defined in the headers. ... The above behavior works in all versions of cmake including the current daily build 2.8.12.20140108-gc5c24. However if there is a CHECK_TYPE_SIZE invocation with BUILTIN_TYPES_ONLY option, further CHECK_TYPE_SIZE without BUILTIN_TYPES_ONLY fails (does not detect/include the required headers sys/types.h, stdint.h, and stddef.h). This is observed in the daily builds (tested on 2.8.12.20140108-gc5c24). Steps to Reproduce: An example CMakeLists.txt attached. == Issue History Date ModifiedUsername FieldChange == 2014-01-09 08:45 Arunmozhi New Issue 2014-01-09 08:45 Arunmozhi File Added: CMakeLists.txt == -- 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] Request to review topic codelite-ide-generator
If all the tests pass for you locally, and you are pretty sure they will all pass on other machines too, then you can do it whenever you think it's ready. (Unless somebody else has given you feedback that you need to address first...) The primary thing is to monitor the Continuous dashboards for the hour or two after you do so, and then the check on the Nightly dashboards the next day. If any build or test failures occur on dashboard builds, you should get emails from the CDash server, but it doesn't hurt to check the dashboard yourself and get in the habit of checking there frequently. And then: just be ready to update the topic with any fixes necessary for other platforms in a timely fashion. If you don't have time to monitor the dashboards for the day or two after you merge a topic, then you should wait until you do have time. Or have a coding buddy that can help you make tweaks to the topic to get it right on all platforms. Hope this helps, David C. -- 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] Generators and Extra Generators
On Wednesday 08 January 2014, Stephen Kelly wrote: Alexander Neundorf wrote: On Tuesday 07 January 2014, Stephen Kelly wrote: Is there a design issue here? I run cmake-gui and select the one I want from a list. What is the problem, the length of the list ? More the combinatorial expansion along multiple axes to add a new type indicates a 'design smell'. this combinatorial expansion can be avoided, internally the main generator and the extra generator are kept separately, and the long list is basically only generated for presenting it to the user and letting him decide what he wants. This could be presented simply in a different way. As I said, in cmake-gui in some way split into two widgets, and for the CLI it could be split into -G maingenerator -X extragenerator. This would need changes mainly in cmake::CreateGlobalGenerator() and cmake::AddExtraGenerator(). Then it goes down from more or less m*n to m+n. 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] Generators and Extra Generators
On Tuesday 07 January 2014, Stephen Kelly wrote: David Cole wrote: There's been a design issue since extra generators were introduced... The question is: is it possible to resolve it with a better design and still keep the existing functionality? Hence this mail :), and my mail to cmake.users about the Kate Extra Generator being the wrong interface/design. I'd like to see cmake generate all the info a UI would need in a simple and non-tied-to-a-particular-implementation way. That would be something Qt Creator and Kate could use as it would list the targets, the compile lines for objects, link targets, link lines etc. Actually an IDE may have somewhat different needs. As long as it uses an existing buildtool (make or ninja), it doesn't actually need the commands for linking, and also not necessarily for compiling. (if the IDE would execute e.g. the link commands directly instead of calling make foo, then the IDE would need to be a complete buildtool, i.e. with full dependency handling between the targets etc.). It does need information which include dirs and definitions are used, per target, probably better per source file, so it can do proper completion etc. IMO it needs information in which CMakeLists.txt a target has been added, to support the user by editing the cmake files. It needs to know to which target(s) a source file belongs, and vice versa, it needs to know the language of each source file (since this can be overridden via the LANGUAGE property in cmake). I'm quite sure IDE developers can think of more they'd like to know. As I said, it would be really cool if this information could be put complete and IDE-independent in a project file. 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] Request to review topic codelite-ide-generator
On Thu, Jan 9, 2014 at 4:21 PM, David Cole dlrd...@aol.com wrote: If all the tests pass for you locally, and you are pretty sure they will all pass on other machines too, then you can do it whenever you think it's ready Thanks, I merged it as described here: http://www.cmake.org/Wiki/CMake/Git/Develop#Merge_a_Topic_for_Testing . (Unless somebody else has given you feedback that you need to address first...) The primary thing is to monitor the Continuous dashboards for the hour or two after you do so, and then the check on the Nightly dashboards the next day. Can you give a link to monitor? If any build or test failures occur on dashboard builds, you should get emails from the CDash server, but it doesn't hurt to check the dashboard yourself and get in the habit of checking there frequently. And then: just be ready to update the topic with any fixes necessary for other platforms in a timely fashion. NP If you don't have time to monitor the dashboards for the day or two after you merge a topic, then you should wait until you do have time. Or have a coding buddy that can help you make tweaks to the topic to get it right on all platforms. Hope this helps, David C. Thanks! -- Eran Ifrah Author of codelite, a cross platform open source C/C++ IDE: http://www.codelite.org wxCrafter, a wxWidgets RAD: http://wxcrafter.codelite.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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Request to review topic codelite-ide-generator
On 09.01.2014 19:34, Eran Ifrah wrote: Can you give a link to monitor? See #3 on http://www.cmake.org/Wiki/CMake:Module_Maintainers for e-Mail notifications. Direct link to the CMake Dashboard: http://open.cdash.org/index.php?project=CMake Nils -- 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] Request to review topic codelite-ide-generator
Thanks! On Thu, Jan 9, 2014 at 8:42 PM, Nils Gladitz nilsglad...@gmail.com wrote: On 09.01.2014 19:34, Eran Ifrah wrote: Can you give a link to monitor? See #3 on http://www.cmake.org/Wiki/CMake:Module_Maintainers for e-Mail notifications. Direct link to the CMake Dashboard: http://open.cdash.org/index.php?project=CMake Nils -- Eran Ifrah Author of codelite, a cross platform open source C/C++ IDE: http://www.codelite.org wxCrafter, a wxWidgets RAD: http://wxcrafter.codelite.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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Request to review topic codelite-ide-generator
On 01/09/2014 01:43 PM, Eran Ifrah wrote: Thanks! On Thu, Jan 9, 2014 at 8:42 PM, Nils Gladitz nilsglad...@gmail.com mailto:nilsglad...@gmail.com wrote: Direct link to the CMake Dashboard: http://open.cdash.org/index.php?project=CMake FYI, there are a few problems with the topic on the continuous builds. Among them are: http://open.cdash.org/viewBuildError.php?type=1buildid=3170636 .../Help/generator/CodeLite.rst:: WARNING: document isn't included in any toctree http://open.cdash.org/viewBuildError.php?buildid=3170622 Error E2193 ...\Source\cmExtraCodeLiteGenerator.cxx 217: Too few parameters in call to 'cmTarget::GetSourceFiles The first is an omission of the new document from the toctree in Help/manual/cmake-generators.7.rst. The second is a logical conflict with another change that updated the signature of cmTarget::GetSourceFiles. This is just bad luck on the timing. Logical conflicts like this have been pretty rare so you're a lucky winner. Please fetch the latest 'master', merge it into your topic, get it compiling again locally, and then push and merge the topic again to 'next'. Alternatively revert the topic from 'next', rebase it on the latest master, and then push again when you're ready. 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
[cmake-developers] [CMake 0014691]: Post build phase to delete directory fails in Xcode project
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=14691 == Reported By:tron_thomas Assigned To: == Project:CMake Issue ID: 14691 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2014-01-09 14:20 EST Last Modified: 2014-01-09 14:20 EST == Summary:Post build phase to delete directory fails in Xcode project Description: If someone creates a post build phase command to delete a directory, that command will fail when executed in Xcode Steps to Reproduce: Create a very simple Hello World code module. Create a directory that can be deleted Use a CMakeLists.txt file like the following to create an Xcode project to build the Hello World application: cmake_minimum_required (VERSION 2.8) project (HelloWorld) add_executable (HelloWorld HelloWorld.cpp) add_custom_command ( TARGET HelloWorld POST_BUILD COMMAND cmake -E remove_directory Path to directory that will be deleted ) Create and build the Xcode project. Expected: The project should build without errors Actual: Even though the directory exists and the path to it is valid, the following error will occur in Xcode make: cmake: No such file or directory Additional Information: Using Xcode version 4.6.3 This problem will not happen if someone creates an UNIX makefile project instead of Xcode. Everything builds successfully == Issue History Date ModifiedUsername FieldChange == 2014-01-09 14:20 tron_thomasNew 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] Review Request for ExternalProjects: Only update certain git submodules
This looks like a reasonable patch to me (just by eye, have not tried it personally). *Although* it would be even better if there were an additional case added in the ExternalProject test that handles passing in (1) an empty git submodule list, and (2) a valid list. Although, unless you add code to the setup of the test git repo for that test, it won't have any submodules in it. And we don't want to introduce any network dependencies to the test suite, so no referencing a real live git repo on the internet. I'd like to see a follow up patch to this one that adds *some* testing, too, even if just of the empty list smoke test variety... Does anybody listening here have a project with some git submodules, and some time to give this a test drive? If so, please do, and let us know the results. If they're positive, we could take the follow up to this patch and get it into CMake 'next'. Thanks, David C. -- 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] Request to review topic codelite-ide-generator
On Thu, Jan 9, 2014 at 9:03 PM, Brad King brad.k...@kitware.com wrote: On 01/09/2014 01:43 PM, Eran Ifrah wrote: Thanks! On Thu, Jan 9, 2014 at 8:42 PM, Nils Gladitz nilsglad...@gmail.commailto: nilsglad...@gmail.com wrote: Direct link to the CMake Dashboard: http://open.cdash.org/index.php?project=CMake FYI, there are a few problems with the topic on the continuous builds. Among them are: http://open.cdash.org/viewBuildError.php?type=1buildid=3170636 .../Help/generator/CodeLite.rst:: WARNING: document isn't included in any toctree http://open.cdash.org/viewBuildError.php?buildid=3170622 Error E2193 ...\Source\cmExtraCodeLiteGenerator.cxx 217: Too few parameters in call to 'cmTarget::GetSourceFiles The first is an omission of the new document from the toctree in Help/manual/cmake-generators.7.rst. The second is a logical conflict with another change that updated the signature of cmTarget::GetSourceFiles. This is just bad luck on the timing. Logical conflicts like this have been pretty rare so you're a lucky winner. Please fetch the latest 'master', merge it into your topic, get it compiling again locally, and then push and merge the topic again to 'next'. Alternatively revert the topic from 'next', rebase it on the latest master, and then push again when you're ready. How do I revert a topic? I can't seem to find it on the wiki Thanks, -Brad -- Eran Ifrah Author of codelite, a cross platform open source C/C++ IDE: http://www.codelite.org wxCrafter, a wxWidgets RAD: http://wxcrafter.codelite.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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] cmake --help-custom-modules compatibility
On Wednesday 08 January 2014, you wrote: On 11/20/2013 07:22 PM, Stephen Kelly wrote: The solution is still to re-implement the --help-custom-modules myman.1 command-line behavior as a special case with warnings. Alex and Steve will have to work out who takes responsibility for that. I'll defer to Alex on doing that I think. Alex, Steve, we need to resolve this compatibility issue soon in preparation for the 3.0 release. since a few weeks I only sporadically find some time :-), so don't rely on me, I can't promise anything currently. 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] Request to review topic codelite-ide-generator
On 01/09/2014 03:39 PM, Eran Ifrah wrote: How do I revert a topic? I can't seem to find it on the wiki There are a few approaches depending on the complexity of the topic. It is a bit tricky, especially if there are merges in the topic. Explaining all the possibilities would take too much space for the basic workflow instructions on the Wiki. Again, it has been pretty rare that this is needed. It was just bad luck that it happened on your first topic ;) I reverted the topic from 'next' for you so that you can merge the rebased topic. Since it is coming back in as a brand new topic you can safely squash the fixup changes back into the original commit before merging to 'next'. FYI, one approach to revert a simple linear topic from 'next' is to extend the topic with 'git revert' commits in reverse order. Merging that to 'next' will undo the effects of the topic. Note that 'next' is only for testing so topics merged to it can contain mis-steps and fixes. We always clean up topic history if necessary before merging to 'master'. -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] Request to review topic codelite-ide-generator
On Thu, Jan 9, 2014 at 11:15 PM, Brad King brad.k...@kitware.com wrote: On 01/09/2014 03:39 PM, Eran Ifrah wrote: How do I revert a topic? I can't seem to find it on the wiki There are a few approaches depending on the complexity of the topic. It is a bit tricky, especially if there are merges in the topic. Explaining all the possibilities would take too much space for the basic workflow instructions I agree. I read the wiki about the 2 approaches of merging topics and I have to say I git lost in there ... My git knowledge is limited and I don't feel comfortable enough to try all the things described there - this is why I decided to ask from one of you to revert the topic from next so the build will not be red ;) on the Wiki. Again, it has been pretty rare that this is needed. It was just bad luck that it happened on your first topic ;) I reverted the topic from 'next' for you so that you can merge the rebased topic. Since it is coming back in as a brand new topic you can safely squash the fixup changes back into the original commit before merging to 'next'. Does this mean that I can start from scratch now? (i.e. new topic, with new name ;) ) FYI, one approach to revert a simple linear topic from 'next' is to extend the topic with 'git revert' commits in reverse order. Merging that to 'next' will undo the effects of the topic. Note that 'next' is only for testing so topics merged to it can contain mis-steps and fixes. We always clean up topic history if necessary before merging to 'master'. See above about my git knowledge I am more of an SVN guy... I am using git, but I am still thinking the Subversion way -Brad -- Eran Ifrah Author of codelite, a cross platform open source C/C++ IDE: http://www.codelite.org wxCrafter, a wxWidgets RAD: http://wxcrafter.codelite.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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Request to review topic codelite-ide-generator
On 01/09/2014 04:21 PM, Eran Ifrah wrote: On Thu, Jan 9, 2014 at 11:15 PM, Brad King wrote: I reverted the topic from 'next' for you so that you can merge the rebased topic. Since it is coming back in as a brand new topic you can safely squash the fixup changes back into the original commit before merging to 'next'. Does this mean that I can start from scratch now? (i.e. new topic, with new name ;) ) Yes. -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
[cmake-developers] Better QNX QCC handling
Hi,
I have this patch:
diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake
index 8d45360..58ec112 100644
--- a/Modules/Platform/QNX.cmake
+++ b/Modules/Platform/QNX.cmake
@@ -1,12 +1,10 @@
set(QNXNTO 1)
-# Revise
-# The QNX GCC does not seem to have -isystem so remove the flag.
-set(CMAKE_INCLUDE_SYSTEM_FLAG_C)
-set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
-# ... Nor does the driver support appropriate flags to create depfiles.
-set(CMAKE_DEPFILE_FLAGS_C)
-set(CMAKE_DEPFILE_FLAGS_CXX)
+set(CMAKE_INCLUDE_SYSTEM_FLAG_C -Wp,-isystem,)
+set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX -Wp,-isystem,)
+
+set(CMAKE_DEPFILE_FLAGS_C -Wc,-MMD,DEPFILE,-MT,OBJECT,-MF,DEPFILE)
+set(CMAKE_DEPFILE_FLAGS_CXX -Wc,-MMD,DEPFILE,-MT,OBJECT,-
MF,DEPFILE)
Following the docs here:
http://www.qnx.com/developers/docs/6.3.2/neutrino/utilities/q/qcc.html
-W phase,arg[,arg ...]
qcc invokes cc1plus, not gcc, which is why the DEPFILE needs to be specified
twice.
This patch assumes that the compiler specified is 'QCC' or 'qcc', but the
common toolchain file in the wild is this one:
https://trac.lcsr.jhu.edu/cisst/attachment/wiki/qnx/Toolchain-QNX-6.4.1.cmake
Instead of using the QCC or qcc compiler drivers, it uses the GCC drivers.
My patch to the QNX.cmake file obviously makes that toolchain file break.
The solution would seem to be to create a new compiler id 'QCC' and put
these flag values and CMAKE_${lang}_COMPILE_OPTIONS_TARGET into it.
Any thoughts on that?
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] cmake --help-custom-modules compatibility
Brad King wrote: If you want CMake 3.0 to do anything better than this then please work on the minimal re-implementation ASAP. Much of the logic can be extracted from old versions and refactored into an isolated compatibility implementation. I think this suffices for now. I'm not aware of any packagers who will try to package old kde releases with new cmake. Let's see if anyone complains. 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] Request to review topic codelite-ide-generator
Thanks Brad. I had created my second attempt this morning and merged it with 'next' - topic name support-codelite-ide-generator I will keep an eye on the contentious build to make sure nothing is broken Eran On Thu, Jan 9, 2014 at 11:24 PM, Brad King brad.k...@kitware.com wrote: On 01/09/2014 04:21 PM, Eran Ifrah wrote: On Thu, Jan 9, 2014 at 11:15 PM, Brad King wrote: I reverted the topic from 'next' for you so that you can merge the rebased topic. Since it is coming back in as a brand new topic you can safely squash the fixup changes back into the original commit before merging to 'next'. Does this mean that I can start from scratch now? (i.e. new topic, with new name ;) ) Yes. -Brad -- Eran Ifrah Author of codelite, a cross platform open source C/C++ IDE: http://www.codelite.org wxCrafter, a wxWidgets RAD: http://wxcrafter.codelite.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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014692]: UseQt4.cmake does not adhere to policy CMP0043
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=14692 == Reported By:Micha Hergarden Assigned To: == Project:CMake Issue ID: 14692 Category: Modules Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2014-01-10 02:33 EST Last Modified: 2014-01-10 02:33 EST == Summary:UseQt4.cmake does not adhere to policy CMP0043 Description: The cmake version 98bdd78afc4dfce9a6ef02d80a94c4b653ccd0b8 yields the following warning when Qt4 is used in a project: Policy CMP0043 is not set: Ignore COMPILE_DEFINITIONS_Config properties. Run cmake --help-policy CMP0043 for policy details. Use the cmake_policy command to set the policy and suppress this warning. This warning is for project developers. Use -Wno-dev to suppress it. The attached patch seems to fix this. Steps to Reproduce: Create a minial cmake project that uses Qt4 and use the above mentioned cmake version to configure it with. NOTE: I only tested using the Make generator. == Issue History Date ModifiedUsername FieldChange == 2014-01-10 02:33 Micha HergardenNew Issue 2014-01-10 02:33 Micha HergardenFile Added: UseQt4.patch == -- 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] Fwd: Visual Studio command line from CMake
Why not just write your own batch ('buildit.bat') file that does:
call vcvarsall.bat
nmake
(or whatever the command to build in the VS command prompt is...)
And then your command to build is:
C:/full/path/to/buildit.bat
It's presumably in a Windows-specific chunk of your CMakeLists anyway,
so that should work fairly simply.
HTH,
David C.
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fwd: Visual Studio command line from CMake
Why not just write your own batch ('buildit.bat') file that does:
call vcvarsall.bat
nmake
(or whatever the command to build in the VS command prompt is...)
And then your command to build is:
C:/full/path/to/buildit.bat
It's presumably in a Windows-specific chunk of your CMakeLists anyway, so
that should work fairly simply.
I think the part of problem would be figuring out what vcvarsall.bat
to run especially if you have more than 1 version of Visual Studio.
John
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fwd: Visual Studio command line from CMake
Each Visual Studio sets a environment variable that helps you locate the
installed location. So for Visual Studio 2008 it is VS90COMNTOOLS, and for
Visual Studio 2010 it is
VS100COMNTOOLS. So you can have a single bat file that is configured by
cmake to determine both the correct env variable to use, and the proper
args to pass to vcvarsall.bat.
On Thu, Jan 9, 2014 at 9:44 AM, John Drescher dresche...@gmail.com wrote:
Why not just write your own batch ('buildit.bat') file that does:
call vcvarsall.bat
nmake
(or whatever the command to build in the VS command prompt is...)
And then your command to build is:
C:/full/path/to/buildit.bat
It's presumably in a Windows-specific chunk of your CMakeLists anyway, so
that should work fairly simply.
I think the part of problem would be figuring out what vcvarsall.bat
to run especially if you have more than 1 version of Visual Studio.
John
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fwd: Visual Studio command line from CMake
I've got a batch file that does something like this to detect the most recent available Visual Studio: @rem ** Add Developer Command Prompt for VS2013, 2012 or 2010 environment: @set _vsver= @set _vs12env=%VS120COMNTOOLS%VsDevCmd.bat @if %_vsver% equ if exist %_vs12env% set _vsver=12 @set _vs11env=%VS110COMNTOOLS%VsDevCmd.bat @if %_vsver% equ if exist %_vs11env% set _vsver=11 @set _vs10env=%VS100COMNTOOLS%vsvars32.bat @if %_vsver% equ if exist %_vs10env% set _vsver=10 @if %_vsver% equ 10 set _vsenv=%_vs10env% @if %_vsver% equ 10 set _vstools=%VS100COMNTOOLS% @if %_vsver% equ 11 set _vsenv=%_vs11env% @if %_vsver% equ 11 set _vstools=%VS110COMNTOOLS% @if %_vsver% equ 12 set _vsenv=%_vs12env% @if %_vsver% equ 12 set _vstools=%VS120COMNTOOLS% @if exist %_vsenv% call %_vsenv% -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fwd: Visual Studio command line from CMake
Correct, this is one of the concerns that makes it more complex than just
searching for the first vcvarsall.bat you come to.
I'd like to match up the vcvarsall to the version of visual studio
currently in use by CMake.
I think there are now enough pieces that I can write a CMake
'FindVSEnvironment.cmake'. While I can't test it for a large number of
MSVC versions, I'll post it and hopefully others can help out.
Rob
On Thu, Jan 9, 2014 at 6:44 AM, John Drescher dresche...@gmail.com wrote:
Why not just write your own batch ('buildit.bat') file that does:
call vcvarsall.bat
nmake
(or whatever the command to build in the VS command prompt is...)
And then your command to build is:
C:/full/path/to/buildit.bat
It's presumably in a Windows-specific chunk of your CMakeLists anyway, so
that should work fairly simply.
I think the part of problem would be figuring out what vcvarsall.bat
to run especially if you have more than 1 version of Visual Studio.
John
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fwd: Visual Studio command line from CMake
On 1/9/2014 1:48 PM, Rob McDonald wrote: Correct, this is one of the concerns that makes it more complex than just searching for the first vcvarsall.bat you come to. I'd like to match up the vcvarsall to the version of visual studio currently in use by CMake. I think there are now enough pieces that I can write a CMake 'FindVSEnvironment.cmake'. While I can't test it for a large number of MSVC versions, I'll post it and hopefully others can help out. Another interesting way to approach this would be to use external project, and use a Visual Studio IDE generator to build the nmake environment. It is not cmake based, but I have done this with Qt and it works great. When the IDE builds the external project the environment is all setup, and you can build from any command line or from a GUI with no environment set. -Bill -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fwd: Visual Studio command line from CMake
But using BUILD_COMMAND() you can get the appropriate build command, the full path ends up specified; it is determined duing the cmake configuration phase and would be the same; hence the same script I showed worked to build makeit.bat that runs Linux GCC Make, MinGW Make, Watcom Make, Visual Studio msbuild or devenv as appropriate. NMake has been depricated you don't need vcvarsall after the initial configuration because all tools and include/link paths are saved as full paths in the script. On Thu, Jan 9, 2014 at 11:03 AM, Bill Hoffman bill.hoff...@kitware.com wrote: On 1/9/2014 1:48 PM, Rob McDonald wrote: Correct, this is one of the concerns that makes it more complex than just searching for the first vcvarsall.bat you come to. I'd like to match up the vcvarsall to the version of visual studio currently in use by CMake. I think there are now enough pieces that I can write a CMake 'FindVSEnvironment.cmake'. While I can't test it for a large number of MSVC versions, I'll post it and hopefully others can help out. Another interesting way to approach this would be to use external project, and use a Visual Studio IDE generator to build the nmake environment. It is not cmake based, but I have done this with Qt and it works great. When the IDE builds the external project the environment is all setup, and you can build from any command line or from a GUI with no environment set. -Bill -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] find_package(MPI) overriding set(MPIEXEC) in CmakeList.txt
Hello, On a Cray XE6, I am using find_package(MPI REQUIRED) in my CMakeLists.txt. It correctly finds all of the MPI stuff, except that it sets the MPIEXEC to the login node mpiexec command. I would like to override this behavior and set the MPIEXEC command to the aprun wrapper, but it is not working. I have tried using set(MPIEXEC aprun) both before and after the find_package(MPI REQUIRED) in my CMakeLists.txt. Thanks Lucas This electronic message transmission and any attachments that accompany it contain information from DRC® (Dynamics Research Corporation) or its subsidiaries, or the intended recipient, which is privileged, proprietary, business confidential, or otherwise protected from disclosure and is the exclusive property of DRC and/or the intended recipient. The information in this email is solely intended for the use of the individual or entity that is the intended recipient. If you are not the intended recipient, any use, dissemination, distribution, retention, or copying of this communication, attachments, or substance is prohibited. If you have received this electronic transmission in error, please immediately reply to the author via email that you received the message by mistake and also promptly and permanently delete this message and all copies of this email and any attachments. We thank you for your assistance and apologize for any inconvenience. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fwd: Visual Studio command line from CMake
All,
Thanks for all the help, I'm getting closer. My current approach does
this
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
INCLUDE( ExternalProject )
SET( VS_MAKEFILE_ZIP vsnet-makefiles.0.85.zip )
IF( MSVC )
IF( MSVC_VERSION EQUAL 1200 )
SET( VS_TOOLS_PATH $ENV{VS60COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1300 )
SET( VS_TOOLS_PATH $ENV{VS70COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1310 )
SET( VS_TOOLS_PATH $ENV{VS71COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1400 )
SET( VS_TOOLS_PATH $ENV{VS80COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1500 )
SET( VS_TOOLS_PATH $ENV{VS90COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1600 )
SET( VS_TOOLS_PATH $ENV{VS100COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1700 )
SET( VS_TOOLS_PATH $ENV{VS110COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}VsDevCmd.bat )
ELSEIF( MSVC_VERSION EQUAL 1800 )
SET( VS_TOOLS_PATH $ENV{VS120COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}VsDevCmd.bat )
ENDIF( MSVC_VERSION EQUAL 1200 )
ENDIF ( MSVC )
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/opts.txt
R
V)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/runthis.bat
call \${VS_ENV_BAT}\
gmake opts.txt)
ExternalProject_Add( FLTK
URL ${CMAKE_SOURCE_DIR}/fltk-1.3.2-source.tar
UPDATE_COMMAND
${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/${VS_MAKEFILE_ZIP}
SOURCE_DIR/${VS_MAKEFILE_ZIP}
COMMAND
${CMAKE_COMMAND} -E tar -xzf SOURCE_DIR/${VS_MAKEFILE_ZIP}
COMMAND
${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/opts.txt
SOURCE_DIR/opts.txt
COMMAND
${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/runthis.bat
SOURCE_DIR/runthis.bat
PATCH_COMMAND
CONFIGURE_COMMAND runthis.bat
BUILD_COMMAND
INSTALL_COMMAND
BUILD_IN_SOURCE 1
)
It doesn't fully work.
-- I create the opts.txt and runthis.bat files in CMAKE_CURRENT_BINARY_DIR
and then copy them to SOURCE_DIR. I couldn't figure out how to write
them within ExternalProject_Add and SOURCE_DIR doesn't exist before
unless I want to reset its value. Suggestions Welcome.
-- opts.txt and runthis.bat end up where I want them and contain what I
want.
-- If you double-click runthis.bat, it successfully builds FLTK.
-- However, running 'runthis.bat' from inside ExternalProject fails. I've
tried 'cmd runthis.bat' 'SOURCE_DIR/runthis.bat' and a few other things,
none work.
I think it may be a problem with the command to run the batch program
doesn't create a new environment, or doesn't keep the environment variables
set by vsvars32.bat.
Suggestions Welcome.
Rob
P.S. The mess of IF code to detect the MSVC version and use the
environment variable has not been vetted and is mostly a guess at this
point. From all the googling I could do, it is probably closeish to right.
P.P.S. vsvarsall.bat Is special because it lets you set 32/64/arm target
and also 32/64 host environments. I would like to support 32/64 target,
but you can't set target without knowing the host environment. Is there a
CMake way to detect whether the Visual Studio host environment is 32/64 bit?
On Thu, Jan 9, 2014 at 10:48 AM, Rob McDonald rob.a.mcdon...@gmail.com
wrote:
Correct, this is one of the concerns that makes it more complex than just
searching for the first vcvarsall.bat you come to.
I'd like to match up the vcvarsall to the version of visual studio
currently in use by CMake.
I think there are now enough pieces that I can write a CMake
'FindVSEnvironment.cmake'. While I can't test it for a large number of
MSVC versions, I'll post it and hopefully others can help out.
Rob
On Thu, Jan 9, 2014 at 6:44 AM, John Drescher dresche...@gmail.com
wrote:
Why not just write your own batch ('buildit.bat') file that does:
call vcvarsall.bat
nmake
(or whatever the command to build in the VS command prompt is...)
And then your command to build is:
C:/full/path/to/buildit.bat
It's presumably in a Windows-specific chunk of your CMakeLists anyway,
so
that should work fairly simply.
I think the part of problem would be figuring out what vcvarsall.bat
to run especially if you have more than 1 version of Visual Studio.
John
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
Re: [CMake] Fwd: Visual Studio command line from CMake
All of that is available from selecting a generator and toolset for
your machine;
cmake uses the registry to find devenv to build visual studio projects
--- part I stole to make sure it uses msbuild.exe in favor of devenv.com ---
if( MSVC10 )
IF(NOT CMAKE_CROSSCOMPILING)
FIND_PROGRAM(REAL_CMAKE_MAKE_PROGRAM
NAMES MSBuild
HINTS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VS;ProductDir]
$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;CLR
Version]/
c:/WINDOWS/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;CLR
Version]/
$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\10.0;CLR
Version]/)
ENDIF()
set( CMAKE_MAKE_PROGRAM ${REAL_CMAKE_MAKE_PROGRAM} )
endif( MSVC10 )
if( MSVC11 )
IF(NOT CMAKE_CROSSCOMPILING)
FIND_PROGRAM(REAL_CMAKE_MAKE_PROGRAM
NAMES MSBuild
HINTS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\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]/)
ENDIF()
set( CMAKE_MAKE_PROGRAM ${REAL_CMAKE_MAKE_PROGRAM} )
set( CMAKE_VS_PLATFORM_TOOLSET v110_xp )
endif( MSVC11 )
--
There is also a setting for the toolset to select arm, or XP compatiblity mode
set( CMAKE_VS_PLATFORM_TOOLSET v110_xp )
On Thu, Jan 9, 2014 at 3:48 PM, Rob McDonald rob.a.mcdon...@gmail.com wrote:
All,
Thanks for all the help, I'm getting closer. My current approach does
this
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
INCLUDE( ExternalProject )
SET( VS_MAKEFILE_ZIP vsnet-makefiles.0.85.zip )
IF( MSVC )
IF( MSVC_VERSION EQUAL 1200 )
SET( VS_TOOLS_PATH $ENV{VS60COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1300 )
SET( VS_TOOLS_PATH $ENV{VS70COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1310 )
SET( VS_TOOLS_PATH $ENV{VS71COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1400 )
SET( VS_TOOLS_PATH $ENV{VS80COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1500 )
SET( VS_TOOLS_PATH $ENV{VS90COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1600 )
SET( VS_TOOLS_PATH $ENV{VS100COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}vsvars32.bat )
ELSEIF( MSVC_VERSION EQUAL 1700 )
SET( VS_TOOLS_PATH $ENV{VS110COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}VsDevCmd.bat )
ELSEIF( MSVC_VERSION EQUAL 1800 )
SET( VS_TOOLS_PATH $ENV{VS120COMNTOOLS} )
SET( VS_ENV_BAT ${VS_TOOLS_PATH}VsDevCmd.bat )
ENDIF( MSVC_VERSION EQUAL 1200 )
ENDIF ( MSVC )
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/opts.txt
R
V)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/runthis.bat
call \${VS_ENV_BAT}\
gmake opts.txt)
ExternalProject_Add( FLTK
URL ${CMAKE_SOURCE_DIR}/fltk-1.3.2-source.tar
UPDATE_COMMAND
${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/${VS_MAKEFILE_ZIP}
SOURCE_DIR/${VS_MAKEFILE_ZIP}
COMMAND
${CMAKE_COMMAND} -E tar -xzf SOURCE_DIR/${VS_MAKEFILE_ZIP}
COMMAND
${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/opts.txt
SOURCE_DIR/opts.txt
COMMAND
${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/runthis.bat
SOURCE_DIR/runthis.bat
PATCH_COMMAND
CONFIGURE_COMMAND runthis.bat
BUILD_COMMAND
INSTALL_COMMAND
BUILD_IN_SOURCE 1
)
It doesn't fully work.
-- I create the opts.txt and runthis.bat files in CMAKE_CURRENT_BINARY_DIR
and then copy them to SOURCE_DIR. I couldn't figure out how to write them
within ExternalProject_Add and SOURCE_DIR doesn't exist before unless I
want to reset its value. Suggestions Welcome.
-- opts.txt and runthis.bat end up where I want them and contain what I
want.
-- If you double-click runthis.bat, it successfully builds FLTK.
-- However, running 'runthis.bat' from inside ExternalProject fails. I've
tried 'cmd runthis.bat' 'SOURCE_DIR/runthis.bat' and a few other things,
none work.
I think it may be a problem with the command to run the batch program
doesn't create a new environment, or doesn't keep the environment variables
set by vsvars32.bat.
Suggestions Welcome.
Rob
P.S. The mess of IF code to detect the MSVC version and use the environment
variable has not been vetted and is mostly a guess at this point. From all
the googling I could do, it is probably closeish to right.
P.P.S. vsvarsall.bat Is special because it lets you set 32/64/arm
[CMake] Filtering out libraries in custom toolchain
Hi all, We have a 3rd-party project that builds on multiple OSes via CMake, with one of them being VxWorks using a custom toolchain (fairly specific to our platform/tools). This project consists of multiple shared libraries with a fairly complex hierarchy, All of this was working just fine until this project was updated to include a few static libraries as well. The issue I am running into is that VxWorks doesn't really have a concept of DLLs linking to each other, so our toolchain file currently neglects to bother passing LINK_LIBRARIES into the linker command line. However, now that we have static libraries, it suddenly needs to do this, since LINK_LIBRARIES includes both static and shared libraries (although these can be differentiated via extension). Basically, I need to filter our LINK_LIBRARIES to only include static libs but not shared libraries. I can't really modify the dependencies at the outer layer to just remove non-static dependencies, because this removes the build-order-dependency information that CMake needs (some components generate files needed by others to build). What is confusing me is that the syntax for creating toolchain command lines is special with variables in angle brackets and I'm not sure how best to do this. Our toolchain file looks something like this: set(CMAKE_CXX_CREATE_SHARED_LIBRARY CMAKE_C_COMPILER OBJECTS -o TARGET ... and I need it to look something like this: set(CMAKE_CXX_CREATE_SHARED_LIBRARY CMAKE_C_COMPILER OBJECTS LINK_STATIC_LIBRARIES -o TARGET ... Can anyone give me some advice on how to create this LINK_STATIC_LIBRARIES behavior (versus LINK_LIBRARIES) ? Thanks, Eric Gross-- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fwd: Visual Studio command line from CMake
Bill, I've scoured those examples and read the documentation many times. I'm also making pretty (perhaps overly) complex use of ExternalProject_Add. I should have been more specific in my request for tips. I have not found examples of ExternalProject driving Visual Studio projects or nmake files. All the common examples drive either ./configure, pure make, or CMake setups. Rob On Thu, Jan 9, 2014 at 11:28 AM, Bill Hoffman bill.hoff...@kitware.comwrote: On 1/9/2014 2:13 PM, Rob McDonald wrote: Bill, This sounds interesting. After FLTK, I have a couple other libraries that need to be packaged as an ExternalProject. I'd appreciate some more details or a link to an example if you have one. Thanks, See Dave Cole's message at the end: http://cmake.3232098.n2.nabble.com/ExternalProjects- Add-limitations-td7586432.html Also, here: http://www.kitware.com/media/html/BuildingExternalProjectsWithCM ake2.8.html -- Bill Hoffman Kitware, Inc. 28 Corporate Drive Clifton Park, NY 12065 bill.hoff...@kitware.com http://www.kitware.com 518 881-4905 (Direct) 518 371-3971 x105 Fax (518) 371-4573 -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fwd: Visual Studio command line from CMake
All, My FLTK EmbeddedProject woes are solved. As it turns out, the path of least resistance was the one I hadn't tried While the FLKT CMake files were indeed out of date, they weren't that bad. Fixing them was by far the best solution. I have a few more libraries for my project, but hopefully they'll go more smoothly. Best, Rob -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6895-g3bf8da3
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 3bf8da318d8d4fbd4abe84d4a299aa8193e92b07 (commit)
via fa3592b94142fb3a97699203ccc771d27d201b0d (commit)
via 3cec090daf1ac41aa62d10542832fe8c44649790 (commit)
from c5c24c3bdf85ecf596cae62c2809da7d24a4d9ff (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=3bf8da318d8d4fbd4abe84d4a299aa8193e92b07
commit 3bf8da318d8d4fbd4abe84d4a299aa8193e92b07
Merge: c5c24c3 fa3592b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Jan 9 08:57:46 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 08:57:46 2014 -0500
Merge topic 'extend-docs' into next
fa3592b Help: Link to CMAKE_POLICY_DEFAULT_CMP in policies manual.
3cec090 Help: Add notes about relocatability of config-file packages.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa3592b94142fb3a97699203ccc771d27d201b0d
commit fa3592b94142fb3a97699203ccc771d27d201b0d
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Jan 9 14:53:38 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Jan 9 14:53:38 2014 +0100
Help: Link to CMAKE_POLICY_DEFAULT_CMP in policies manual.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 9138660..8818a24 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -16,7 +16,9 @@ versions will begin to warn about the backward compatible
behavior. It
is possible to disable the warning by explicitly requesting the OLD, or
backward compatible behavior using the :command:`cmake_policy` command.
It is also possible to request NEW, or non-backward compatible behavior
-for a policy, also avoiding the warning.
+for a policy, also avoiding the warning. The default behavior for a policy is
+to warn by default, but that may be overridden from the command line by
+setting the :variable:`CMAKE_POLICY_DEFAULT_CMP` variable.
The :command:`cmake_minimum_required` command does more than report an
error if a too-old version of CMake is used to build a project. It
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cec090daf1ac41aa62d10542832fe8c44649790
commit 3cec090daf1ac41aa62d10542832fe8c44649790
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jan 7 18:15:27 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Jan 9 14:53:02 2014 +0100
Help: Add notes about relocatability of config-file packages.
diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst
index b572bf7..b5447a6 100644
--- a/Help/manual/cmake-packages.7.rst
+++ b/Help/manual/cmake-packages.7.rst
@@ -392,11 +392,47 @@ should be provided by the ``ClimbingStats`` package, they
should
be in a separate file which is installed to the same location as the
``ClimbingStatsConfig.cmake`` file, and included from there.
+Packages created by :command:`install(EXPORT)` are designed to be relocatable,
+using paths relative to the location of the package itself. When defining
+the interface of a target for ``EXPORT``, keep in mind that the include
+directories should be specified as relative paths which are relative to the
+:variable:`CMAKE_INSTALL_PREFIX`:
+
+.. code-block:: cmake
+
+ target_include_directories(tgt INTERFACE
+# Wrong, not relocatable:
+$INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/TgtName
+ )
+
+ target_include_directories(tgt INTERFACE
+# Ok, relocatable:
+$INSTALL_INTERFACE:include/TgtName
+ )
+
+The ``$INSTALL_PREFIX``
+:manual:`generator expression cmake-generator-expressions(7)` may be used as
+a placeholder for the install prefix without resulting in a non-relocatable
+package. This is necessary if complex generator expressions are used:
+
+.. code-block:: cmake
+
+ target_include_directories(tgt INTERFACE
+# Ok, relocatable:
+$INSTALL_INTERFACE:$$CONFIG:Debug:$INSTALL_PREFIX/include/TgtName
+ )
+
+As a special case, packages are not relocatable if installed to the ``/usr``
+or ``/`` prefix on linux, and ``/lib`` is a symlink to ``/usr/lib``. This is
+a workaround for some linux distros creating such a symlink and causing the
+relative paths to be evaluated incorrectly. As installations to ``/usr`` are
+generally managed by a package manager, they do not need to be relocatable.
+
The :command:`export(EXPORT)` command creates an :prop_tgt:`IMPORTED` targets
-definition file which is specific to the build-tree. This can similiarly be
-used with a suitable package configuration file and package version file to
-define a package for the
[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1137-gdf55a93
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 df55a930fa2a2af933a351efe0a24dd2f958a541 (commit) via e8b8b37ef6fef094940d3384df5a1d421b9fa568 (commit) from e5783a6f5144bf167534c72641c85a8af9a687a9 (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=df55a930fa2a2af933a351efe0a24dd2f958a541 commit df55a930fa2a2af933a351efe0a24dd2f958a541 Merge: e5783a6 e8b8b37 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jan 9 09:37:12 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jan 9 09:37:12 2014 -0500 Merge topic 'qt4-find-root' e8b8b37 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted. --- Summary of changes: Modules/FindQt4.cmake |7 +-- 1 files changed, 5 insertions(+), 2 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, master, updated. v2.8.12.1-1139-gf3a9eb4
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 f3a9eb45605638b42ca431731080875470cc229a (commit) via c1311077b82e1ac4599101467162cdb45be217ec (commit) from df55a930fa2a2af933a351efe0a24dd2f958a541 (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=f3a9eb45605638b42ca431731080875470cc229a commit f3a9eb45605638b42ca431731080875470cc229a Merge: df55a93 c131107 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jan 9 09:37:15 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jan 9 09:37:15 2014 -0500 Merge topic 'vs10-include-backslashes' c131107 VS: Convert include path to backslashes for VS = 10 --- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx |4 +++- 1 files changed, 3 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, master, updated. v2.8.12.1-1135-ge5783a6
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 e5783a6f5144bf167534c72641c85a8af9a687a9 (commit) via f293d525a1ceb77e041ec71d8d83f8674916d406 (commit) from ef2bb1c6ed39a593d29c1af0d5b878080581635e (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=e5783a6f5144bf167534c72641c85a8af9a687a9 commit e5783a6f5144bf167534c72641c85a8af9a687a9 Merge: ef2bb1c f293d52 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jan 9 09:37:09 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jan 9 09:37:09 2014 -0500 Merge topic 'multiarch-multios' f293d52 GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels --- Summary of changes: Modules/GNUInstallDirs.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.12.1-6903-g7884620
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 78846206760b1d1b04aa97ffb32fd3e16c54e368 (commit) via a0eb52c10c759f4492642d912a8fc70c802ad6a0 (commit) via 15562c11efa3c3a9e0f28f9ad52b71623c254b05 (commit) via 69c366a28178027a5cf2629c0240d1709ae9ab55 (commit) via f3a9eb45605638b42ca431731080875470cc229a (commit) via df55a930fa2a2af933a351efe0a24dd2f958a541 (commit) via e5783a6f5144bf167534c72641c85a8af9a687a9 (commit) via ef2bb1c6ed39a593d29c1af0d5b878080581635e (commit) from 3bf8da318d8d4fbd4abe84d4a299aa8193e92b07 (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=78846206760b1d1b04aa97ffb32fd3e16c54e368 commit 78846206760b1d1b04aa97ffb32fd3e16c54e368 Merge: 3bf8da3 a0eb52c Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jan 9 09:38:00 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Jan 9 09:38:00 2014 -0500 Merge branch 'master' into next --- 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, master, updated. v2.8.12.1-1147-g15562c1
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 15562c11efa3c3a9e0f28f9ad52b71623c254b05 (commit)
via 73e93400e2efab2096618ff58a5ad68236cd04aa (commit)
via ab9f58f657a244d182ccd9a9361fae0a7c068f20 (commit)
via 37ebeb910073aa142b41daa949dabf978e4d749d (commit)
via 6aabb6a62b679f64e278087fc671cd33a35bf871 (commit)
via 5bb53f6b731228e4592066329e8992987289a986 (commit)
from 69c366a28178027a5cf2629c0240d1709ae9ab55 (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=15562c11efa3c3a9e0f28f9ad52b71623c254b05
commit 15562c11efa3c3a9e0f28f9ad52b71623c254b05
Merge: 69c366a 73e9340
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jan 9 09:37:20 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 09:37:20 2014 -0500
Merge topic 'policies'
73e9340 get_target_property: Error on non-existent target.
ab9f58f FindQt4: Ensure target exists before calling get_target_property.
37ebeb9 FindQt4: Fix use of get_target_property to use actual target name.
6aabb6a Genex: Use case-sensitive comparison for COMPILER_ID.
5bb53f6 cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy.
---
Summary of changes:
Help/manual/cmake-policies.7.rst |3 ++
Help/policy/CMP0043.rst| 39
Help/policy/CMP0044.rst| 19 ++
Help/policy/CMP0045.rst| 17 +
Modules/FindQt4.cmake | 26 --
Source/cmGeneratorExpressionEvaluator.cxx | 31 +++-
Source/cmGetTargetPropertyCommand.cxx | 31 +++-
Source/cmGlobalGenerator.cxx | 23 +++-
Source/cmMakefile.cxx | 28 ---
Source/cmPolicies.cxx | 15
Source/cmPolicies.h|3 ++
Source/cmTarget.cxx| 36 ++
Tests/CompileDefinitions/compiletest.c |4 ++
.../CompileDefinitions/target_prop/CMakeLists.txt |3 ++
Tests/GeneratorExpression/CMP0044/CMakeLists.txt | 19 ++
.../GeneratorExpression/CMP0044/cmp0044-check.cpp | 26 +
Tests/GeneratorExpression/CMakeLists.txt |6 +++
.../CMP0043-NEW-result.txt}|0
.../CMP0043-NEW-stderr.txt}|0
Tests/RunCMake/CMP0043/CMP0043-NEW.cmake |7
.../CMP0043-OLD-result.txt}|0
.../CMP0043-OLD-stderr.txt}|0
Tests/RunCMake/CMP0043/CMP0043-OLD.cmake |7
.../CMP0043-WARN-result.txt} |0
Tests/RunCMake/CMP0043/CMP0043-WARN-stderr.txt |5 +++
Tests/RunCMake/CMP0043/CMP0043-WARN.cmake |5 +++
Tests/RunCMake/CMP0043/CMakeLists.txt |7
Tests/RunCMake/CMP0043/RunCMakeTest.cmake |7
Tests/RunCMake/{CMP0022 = CMP0043}/empty.cpp |0
.../CMP0045-NEW-result.txt}|0
Tests/RunCMake/CMP0045/CMP0045-NEW-stderr.txt |4 ++
Tests/RunCMake/CMP0045/CMP0045-NEW.cmake |4 ++
.../CMP0045-OLD-result.txt}|0
.../CMP0045-OLD-stderr.txt}|0
Tests/RunCMake/CMP0045/CMP0045-OLD.cmake |4 ++
.../CMP0045-WARN-result.txt} |0
Tests/RunCMake/CMP0045/CMP0045-WARN-stderr.txt |9 +
Tests/RunCMake/CMP0045/CMP0045-WARN.cmake |2 +
Tests/RunCMake/{CMP0041 = CMP0045}/CMakeLists.txt |0
Tests/RunCMake/CMP0045/RunCMakeTest.cmake |5 +++
Tests/RunCMake/{CMP0022 = CMP0045}/empty.cpp |0
Tests/RunCMake/CMakeLists.txt |2 +
.../CMP0044-WARN-result.txt} |0
.../GeneratorExpression/CMP0044-WARN-stderr.txt|7
.../GeneratorExpression/CMP0044-WARN.cmake | 17 +
.../GeneratorExpression/RunCMakeTest.cmake |1 +
46 files changed, 378 insertions(+), 44 deletions(-)
create mode 100644 Help/policy/CMP0043.rst
create mode 100644 Help/policy/CMP0044.rst
create mode 100644 Help/policy/CMP0045.rst
create mode 100644 Tests/GeneratorExpression/CMP0044/CMakeLists.txt
create mode 100644 Tests/GeneratorExpression/CMP0044/cmp0044-check.cpp
copy
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6907-g2fc6ed0
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 2fc6ed03e3a5adb756388e93ffb8b0da50f75445 (commit)
via 37136b3ab6ef8beb394475c042aa8d71e82a4413 (commit)
from 5f76ea1b2e613e0e83d0b81991e5ceb76fd55609 (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=2fc6ed03e3a5adb756388e93ffb8b0da50f75445
commit 2fc6ed03e3a5adb756388e93ffb8b0da50f75445
Merge: 5f76ea1 37136b3
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Jan 9 10:02:04 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 10:02:04 2014 -0500
Merge topic 'CheckTypeSize_fix_multiple_invocation' into next
37136b3 CheckTypeSize: Unset variables used during parsing when no longer
needed
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37136b3ab6ef8beb394475c042aa8d71e82a4413
commit 37136b3ab6ef8beb394475c042aa8d71e82a4413
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Jan 9 15:57:07 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Jan 9 15:59:20 2014 +0100
CheckTypeSize: Unset variables used during parsing when no longer needed
When the macro is invoked several time, the parsing variables are not
unset and therefore used for all the following calls.
This fixes issue #14690
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index a9efae4..ec28d8b 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -222,6 +222,8 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
check_include_file(stdint.h HAVE_STDINT_H)
check_include_file(stddef.h HAVE_STDDEF_H)
endif()
+ unset(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY)
+ unset(_CHECK_TYPE_SIZE_LANGUAGE)
# Compute or load the size or size map.
set(${VARIABLE}_KEYS)
---
Summary of changes:
Modules/CheckTypeSize.cmake |2 ++
1 files changed, 2 insertions(+), 0 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.12.1-6905-g5f76ea1
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 5f76ea1b2e613e0e83d0b81991e5ceb76fd55609 (commit)
via 519084cd2e7d4943ea89721b90e98772f3dd44a4 (commit)
from 78846206760b1d1b04aa97ffb32fd3e16c54e368 (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=5f76ea1b2e613e0e83d0b81991e5ceb76fd55609
commit 5f76ea1b2e613e0e83d0b81991e5ceb76fd55609
Merge: 7884620 519084c
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jan 9 10:01:48 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 10:01:48 2014 -0500
Merge topic 'find-java-os-x-fixes' into next
519084c FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=519084cd2e7d4943ea89721b90e98772f3dd44a4
commit 519084cd2e7d4943ea89721b90e98772f3dd44a4
Author: Joe Abbey jab...@arxan.com
AuthorDate: Thu Jan 9 09:59:35 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jan 9 09:59:56 2014 -0500
FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 29a247d..f1cb57e 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -238,6 +238,7 @@ find_path(JAVA_INCLUDE_PATH jni.h
find_path(JAVA_INCLUDE_PATH2 jni_md.h
${JAVA_INCLUDE_PATH}
+ ${JAVA_INCLUDE_PATH}/darwin
${JAVA_INCLUDE_PATH}/win32
${JAVA_INCLUDE_PATH}/linux
${JAVA_INCLUDE_PATH}/freebsd
---
Summary of changes:
Modules/FindJNI.cmake |1 +
1 files changed, 1 insertions(+), 0 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.12.1-6913-g773994b
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 773994be6c8bae560db542e5229deb7f29970830 (commit)
via 531e40b95e80fbf5547b0a8d71196e819bb3aa3d (commit)
via 38de54cf6f3daae70792fae1bf26b97bccc78de4 (commit)
from 2924d3bbf63e389170c80145b852a30cc20b9d0e (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=773994be6c8bae560db542e5229deb7f29970830
commit 773994be6c8bae560db542e5229deb7f29970830
Merge: 2924d3b 531e40b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Jan 9 13:38:33 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 13:38:33 2014 -0500
Merge topic 'minor-cleanups' into next
531e40b cmTarget: Make GetSourceFiles populate an out-vector parameter.
38de54c cmGeneratorTarget: Add methods to access source file groups.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=531e40b95e80fbf5547b0a8d71196e819bb3aa3d
commit 531e40b95e80fbf5547b0a8d71196e819bb3aa3d
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sun Jul 14 18:22:57 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Jan 9 19:38:08 2014 +0100
cmTarget: Make GetSourceFiles populate an out-vector parameter.
In a future patch, this will also be populated with extra
sources from the linked dependencies.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx
b/Source/cmExtraCodeBlocksGenerator.cxx
index fce1284..a066153 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -398,7 +398,8 @@ void cmExtraCodeBlocksGenerator
case cmTarget::OBJECT_LIBRARY:
case cmTarget::UTILITY: // can have sources since 2.6.3
{
- const std::vectorcmSourceFile*sources=ti-second.GetSourceFiles();
+ std::vectorcmSourceFile* sources;
+ ti-second.GetSourceFiles(sources);
for (std::vectorcmSourceFile*::const_iterator si=sources.begin();
si!=sources.end(); si++)
{
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx
b/Source/cmExtraEclipseCDT4Generator.cxx
index c93187e..3e9b786 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -559,7 +559,8 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
std::vectorcmSourceGroup sourceGroups=makefile-GetSourceGroups();
// get the files from the source lists then add them to the groups
cmTarget* tgt = const_castcmTarget*(ti-second);
- std::vectorcmSourceFile*const files = tgt-GetSourceFiles();
+ std::vectorcmSourceFile* files;
+ tgt-GetSourceFiles(files);
for(std::vectorcmSourceFile*::const_iterator sfIt = files.begin();
sfIt != files.end();
sfIt++)
diff --git a/Source/cmExtraSublimeTextGenerator.cxx
b/Source/cmExtraSublimeTextGenerator.cxx
index 9cbdd7c..52411e8 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -237,7 +237,8 @@ void cmExtraSublimeTextGenerator::
{
cmGeneratorTarget *gtgt = this-GlobalGenerator
-GetGeneratorTarget(target);
- std::vectorcmSourceFile* const sourceFiles = target-GetSourceFiles();
+ std::vectorcmSourceFile* sourceFiles;
+ target-GetSourceFiles(sourceFiles);
std::vectorcmSourceFile*::const_iterator sourceFilesEnd =
sourceFiles.end();
for (std::vectorcmSourceFile*::const_iterator iter =
diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx
index b08c335..4ce1ea5 100644
--- a/Source/cmFLTKWrapUICommand.cxx
+++ b/Source/cmFLTKWrapUICommand.cxx
@@ -132,8 +132,8 @@ void cmFLTKWrapUICommand::FinalPass()
cmSystemTools::Message(msg.c_str(),Warning);
return;
}
- std::vectorcmSourceFile* const srcs =
-target-GetSourceFiles();
+ std::vectorcmSourceFile* srcs;
+ target-GetSourceFiles(srcs);
bool found = false;
for (unsigned int i = 0; i srcs.size(); ++i)
{
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 88f533c..5cd1f42 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -284,9 +284,9 @@ bool cmGeneratorTarget::GetPropertyAsBool(const char *prop)
const
}
//
-std::vectorcmSourceFile* const cmGeneratorTarget::GetSourceFiles() const
+void cmGeneratorTarget::GetSourceFiles(std::vectorcmSourceFile* files) const
{
- return this-Target-GetSourceFiles();
+
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6916-g86b6c80
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 86b6c80ab28d4d6b81b28646d04b94c06c65ccdc (commit) via 15d7f7fb99cda35c9c1b2eeaf3c4488cb46fb093 (commit) via 381282f4b0e697c90cc6148d1d7aff6d5557ee8d (commit) from 773994be6c8bae560db542e5229deb7f29970830 (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=86b6c80ab28d4d6b81b28646d04b94c06c65ccdc commit 86b6c80ab28d4d6b81b28646d04b94c06c65ccdc Merge: 773994b 15d7f7f Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu Jan 9 13:44:53 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jan 9 13:44:53 2014 -0500 Merge topic 'extend-docs' into next 15d7f7f Remove note about usr-move. 381282f Re-word policy doc. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15d7f7fb99cda35c9c1b2eeaf3c4488cb46fb093 commit 15d7f7fb99cda35c9c1b2eeaf3c4488cb46fb093 Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu Jan 9 19:44:07 2014 +0100 Commit: Stephen Kelly steve...@gmail.com CommitDate: Thu Jan 9 19:44:07 2014 +0100 Remove note about usr-move. diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index b5447a6..e87eb83 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -422,12 +422,6 @@ package. This is necessary if complex generator expressions are used: $INSTALL_INTERFACE:$$CONFIG:Debug:$INSTALL_PREFIX/include/TgtName ) -As a special case, packages are not relocatable if installed to the ``/usr`` -or ``/`` prefix on linux, and ``/lib`` is a symlink to ``/usr/lib``. This is -a workaround for some linux distros creating such a symlink and causing the -relative paths to be evaluated incorrectly. As installations to ``/usr`` are -generally managed by a package manager, they do not need to be relocatable. - The :command:`export(EXPORT)` command creates an :prop_tgt:`IMPORTED` targets definition file which is specific to the build-tree, and is not relocatable. This can similiarly be used with a suitable package configuration file and http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=381282f4b0e697c90cc6148d1d7aff6d5557ee8d commit 381282f4b0e697c90cc6148d1d7aff6d5557ee8d Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu Jan 9 19:43:07 2014 +0100 Commit: Stephen Kelly steve...@gmail.com CommitDate: Thu Jan 9 19:43:07 2014 +0100 Re-word policy doc. diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index 8818a24..c469de0 100644 --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@ -16,9 +16,9 @@ versions will begin to warn about the backward compatible behavior. It is possible to disable the warning by explicitly requesting the OLD, or backward compatible behavior using the :command:`cmake_policy` command. It is also possible to request NEW, or non-backward compatible behavior -for a policy, also avoiding the warning. The default behavior for a policy is -to warn by default, but that may be overridden from the command line by -setting the :variable:`CMAKE_POLICY_DEFAULT_CMP` variable. +for a policy, also avoiding the warning. Each policy can also be set to +either NEW or OLD behavior explicitly on the command line with the +:variable:`CMAKE_POLICY_DEFAULT_CMP` variable. The :command:`cmake_minimum_required` command does more than report an error if a too-old version of CMake is used to build a project. It --- Summary of changes: Help/manual/cmake-packages.7.rst |6 -- Help/manual/cmake-policies.7.rst |6 +++--- 2 files changed, 3 insertions(+), 9 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.12.1-6919-g58619db
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 58619db936ab0a3fea9ab8a6aec58fa5b527f7b7 (commit)
via 2f15a0772772977529afe159f5f9146941cbfbc8 (commit)
via bb8bde35b8eb75d0edb8bc2812ddc22bdc61fd58 (commit)
from 86b6c80ab28d4d6b81b28646d04b94c06c65ccdc (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=58619db936ab0a3fea9ab8a6aec58fa5b527f7b7
commit 58619db936ab0a3fea9ab8a6aec58fa5b527f7b7
Merge: 86b6c80 2f15a07
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Jan 9 13:45:45 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 13:45:45 2014 -0500
Merge topic 'extend-docs' into next
2f15a07 Help: Link to CMAKE_POLICY_DEFAULT_CMP in policies manual.
bb8bde3 Help: Add notes about relocatability of config-file packages.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f15a0772772977529afe159f5f9146941cbfbc8
commit 2f15a0772772977529afe159f5f9146941cbfbc8
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Jan 9 14:53:38 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Jan 9 19:45:08 2014 +0100
Help: Link to CMAKE_POLICY_DEFAULT_CMP in policies manual.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 9138660..c469de0 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -16,7 +16,9 @@ versions will begin to warn about the backward compatible
behavior. It
is possible to disable the warning by explicitly requesting the OLD, or
backward compatible behavior using the :command:`cmake_policy` command.
It is also possible to request NEW, or non-backward compatible behavior
-for a policy, also avoiding the warning.
+for a policy, also avoiding the warning. Each policy can also be set to
+either NEW or OLD behavior explicitly on the command line with the
+:variable:`CMAKE_POLICY_DEFAULT_CMP` variable.
The :command:`cmake_minimum_required` command does more than report an
error if a too-old version of CMake is used to build a project. It
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb8bde35b8eb75d0edb8bc2812ddc22bdc61fd58
commit bb8bde35b8eb75d0edb8bc2812ddc22bdc61fd58
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jan 7 18:15:27 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Jan 9 19:45:08 2014 +0100
Help: Add notes about relocatability of config-file packages.
diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst
index b572bf7..e87eb83 100644
--- a/Help/manual/cmake-packages.7.rst
+++ b/Help/manual/cmake-packages.7.rst
@@ -392,11 +392,41 @@ should be provided by the ``ClimbingStats`` package, they
should
be in a separate file which is installed to the same location as the
``ClimbingStatsConfig.cmake`` file, and included from there.
+Packages created by :command:`install(EXPORT)` are designed to be relocatable,
+using paths relative to the location of the package itself. When defining
+the interface of a target for ``EXPORT``, keep in mind that the include
+directories should be specified as relative paths which are relative to the
+:variable:`CMAKE_INSTALL_PREFIX`:
+
+.. code-block:: cmake
+
+ target_include_directories(tgt INTERFACE
+# Wrong, not relocatable:
+$INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/TgtName
+ )
+
+ target_include_directories(tgt INTERFACE
+# Ok, relocatable:
+$INSTALL_INTERFACE:include/TgtName
+ )
+
+The ``$INSTALL_PREFIX``
+:manual:`generator expression cmake-generator-expressions(7)` may be used as
+a placeholder for the install prefix without resulting in a non-relocatable
+package. This is necessary if complex generator expressions are used:
+
+.. code-block:: cmake
+
+ target_include_directories(tgt INTERFACE
+# Ok, relocatable:
+$INSTALL_INTERFACE:$$CONFIG:Debug:$INSTALL_PREFIX/include/TgtName
+ )
+
The :command:`export(EXPORT)` command creates an :prop_tgt:`IMPORTED` targets
-definition file which is specific to the build-tree. This can similiarly be
-used with a suitable package configuration file and package version file to
-define a package for the build tree which may be used without installation.
-Consumers of the build tree can simply ensure that the
+definition file which is specific to the build-tree, and is not relocatable.
+This can similiarly be used with a suitable package configuration file and
+package version file to define a package for the build tree which may be used
+without installation. Consumers of the build tree can simply ensure that
[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1151-g089ae71
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 089ae7122b3ba030ca55b5a85be54b334c16f4b2 (commit) via d729899a26ba0086e03708ee7316e23d70a4fb2c (commit) from a0eb52c10c759f4492642d912a8fc70c802ad6a0 (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=089ae7122b3ba030ca55b5a85be54b334c16f4b2 commit 089ae7122b3ba030ca55b5a85be54b334c16f4b2 Merge: a0eb52c d729899 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jan 9 13:54:21 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jan 9 13:54:21 2014 -0500 Merge topic 'FindBoost-ms-debug-runtime' d729899 FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686) --- Summary of changes: Modules/FindBoost.cmake |8 +++- 1 files changed, 7 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, master, updated. v2.8.12.1-1156-ge56530f
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 e56530f6121a96c0434cba673d530366907df980 (commit) via 531e40b95e80fbf5547b0a8d71196e819bb3aa3d (commit) via 38de54cf6f3daae70792fae1bf26b97bccc78de4 (commit) via f579fe0d7a102df0c69c957d48e3e728333dffe1 (commit) via 590d238914ff1b8652c0074e6715f51cad5eb7db (commit) from 089ae7122b3ba030ca55b5a85be54b334c16f4b2 (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=e56530f6121a96c0434cba673d530366907df980 commit e56530f6121a96c0434cba673d530366907df980 Merge: 089ae71 531e40b Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jan 9 13:54:23 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jan 9 13:54:23 2014 -0500 Merge topic 'minor-cleanups' 531e40b cmTarget: Make GetSourceFiles populate an out-vector parameter. 38de54c cmGeneratorTarget: Add methods to access source file groups. f579fe0 Help: Fix link to MAP_IMPORTED_CONFIG_CONFIG 590d238 cmTarget: Handle NO_SYSTEM_FROM_IMPORTED. --- Summary of changes: Help/manual/cmake-buildsystem.7.rst|2 +- Source/cmExtraCodeBlocksGenerator.cxx |3 +- Source/cmExtraEclipseCDT4Generator.cxx |3 +- Source/cmExtraSublimeTextGenerator.cxx |3 +- Source/cmFLTKWrapUICommand.cxx |4 +- Source/cmGeneratorTarget.cxx | 100 +-- Source/cmGeneratorTarget.h | 47 - Source/cmGlobalGenerator.cxx |3 +- Source/cmGlobalKdevelopGenerator.cxx |3 +- Source/cmGlobalNinjaGenerator.cxx |8 ++- Source/cmGlobalUnixMakefileGenerator3.cxx |8 ++- Source/cmGlobalVisualStudioGenerator.cxx | 14 ++-- Source/cmGlobalXCodeGenerator.cxx | 20 -- Source/cmLocalGenerator.cxx|6 +- Source/cmLocalVisualStudio6Generator.cxx |7 +- Source/cmLocalVisualStudio7Generator.cxx |7 +- Source/cmMakefileTargetGenerator.cxx | 32 ++--- Source/cmNinjaTargetGenerator.cxx | 34 +++--- Source/cmNinjaUtilityTargetGenerator.cxx |4 +- Source/cmQtAutoGenerators.cxx | 12 ++- Source/cmTarget.cxx|7 +- Source/cmTarget.h |2 +- Source/cmVisualStudio10TargetGenerator.cxx | 58 ++-- 23 files changed, 272 insertions(+), 115 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.12.1-6922-g06c6957
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 06c69573fa02e82da195a8db054ed23f3b83f724 (commit) via e56530f6121a96c0434cba673d530366907df980 (commit) via 089ae7122b3ba030ca55b5a85be54b334c16f4b2 (commit) from 58619db936ab0a3fea9ab8a6aec58fa5b527f7b7 (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=06c69573fa02e82da195a8db054ed23f3b83f724 commit 06c69573fa02e82da195a8db054ed23f3b83f724 Merge: 58619db e56530f Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jan 9 13:54:57 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Jan 9 13:54:57 2014 -0500 Merge branch 'master' into next --- Summary of changes: 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.12.1-6924-g6e0c6aa
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 6e0c6aae76ade61742bdce208380ce902451e87d (commit)
via e7a111f0945315b983cdb4d5d9f94b28e52598d4 (commit)
from 06c69573fa02e82da195a8db054ed23f3b83f724 (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=6e0c6aae76ade61742bdce208380ce902451e87d
commit 6e0c6aae76ade61742bdce208380ce902451e87d
Merge: 06c6957 e7a111f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Jan 9 14:30:14 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 14:30:14 2014 -0500
Merge topic 'minor-cleanups' into next
e7a111f InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG
whitelisting
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7a111f0945315b983cdb4d5d9f94b28e52598d4
commit e7a111f0945315b983cdb4d5d9f94b28e52598d4
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Jan 9 12:41:29 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Jan 9 20:11:42 2014 +0100
InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelisting
The target properties with this prefix are whitelisted for
INTERFACE_LIBRARY targets.
diff --git a/Tests/InterfaceLibrary/CMakeLists.txt
b/Tests/InterfaceLibrary/CMakeLists.txt
index b396eb6..81b34e6 100644
--- a/Tests/InterfaceLibrary/CMakeLists.txt
+++ b/Tests/InterfaceLibrary/CMakeLists.txt
@@ -29,3 +29,16 @@ target_link_libraries(iface_whitelist INTERFACE
$$BOOL:$TARGET_PROPERTY:CUSTO
add_executable(exec_whitelist dummy.cpp)
target_link_libraries(exec_whitelist iface_whitelist)
+
+add_library(iface_imported INTERFACE IMPORTED)
+set_property(TARGET iface_imported PROPERTY
+ INTERFACE_COMPILE_DEFINITIONS
+$$CONFIG:SPECIAL:SPECIAL_MODE
+$$CONFIG:Debug:DEBUG_MODE
+)
+set_property(TARGET iface_imported PROPERTY
+ MAP_IMPORTED_CONFIG_DEBUG SPECIAL
+)
+
+add_executable(map_config map_config.cpp)
+target_link_libraries(map_config iface_imported)
diff --git a/Tests/InterfaceLibrary/map_config.cpp
b/Tests/InterfaceLibrary/map_config.cpp
new file mode 100644
index 000..81bb666
--- /dev/null
+++ b/Tests/InterfaceLibrary/map_config.cpp
@@ -0,0 +1,15 @@
+
+#ifdef DEBUG_MODE
+#ifndef SPECIAL_MODE
+#error Special configuration should be mapped to debug configuration.
+#endif
+#else
+#ifdef SPECIAL_MODE
+#error Special configuration should not be enabled if not debug configuration
+#endif
+#endif
+
+int main(int,char**)
+{
+ return 0;
+}
---
Summary of changes:
Tests/InterfaceLibrary/CMakeLists.txt | 13 +
Tests/InterfaceLibrary/map_config.cpp | 15 +++
2 files changed, 28 insertions(+), 0 deletions(-)
create mode 100644 Tests/InterfaceLibrary/map_config.cpp
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, master, updated. v2.8.12.1-1159-g98bdd78
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 98bdd78afc4dfce9a6ef02d80a94c4b653ccd0b8 (commit) via 2f15a0772772977529afe159f5f9146941cbfbc8 (commit) via bb8bde35b8eb75d0edb8bc2812ddc22bdc61fd58 (commit) from e56530f6121a96c0434cba673d530366907df980 (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=98bdd78afc4dfce9a6ef02d80a94c4b653ccd0b8 commit 98bdd78afc4dfce9a6ef02d80a94c4b653ccd0b8 Merge: e56530f 2f15a07 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jan 9 16:26:30 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jan 9 16:26:30 2014 -0500 Merge topic 'extend-docs' 2f15a07 Help: Link to CMAKE_POLICY_DEFAULT_CMP in policies manual. bb8bde3 Help: Add notes about relocatability of config-file packages. --- Summary of changes: Help/manual/cmake-packages.7.rst | 38 ++ Help/manual/cmake-policies.7.rst |4 +++- 2 files changed, 37 insertions(+), 5 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.12.1-6928-g5233a3d
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 5233a3ddc6e6a79f1374c86839eb5c74fde4d2ca (commit) via 98bdd78afc4dfce9a6ef02d80a94c4b653ccd0b8 (commit) from 16e62a667712dda22425f7cfb4162fcd7a5e3db0 (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=5233a3ddc6e6a79f1374c86839eb5c74fde4d2ca commit 5233a3ddc6e6a79f1374c86839eb5c74fde4d2ca Merge: 16e62a6 98bdd78 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jan 9 16:27:01 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Jan 9 16:27:01 2014 -0500 Merge branch 'master' into next --- Summary of changes: 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.12.1-6930-g4b343f0
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 4b343f0c08060d81bc7fb7d20973d5383ae24409 (commit)
via ea9c30e39bff5b2316bc5f6bc607a4813da8001d (commit)
from 5233a3ddc6e6a79f1374c86839eb5c74fde4d2ca (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=4b343f0c08060d81bc7fb7d20973d5383ae24409
commit 4b343f0c08060d81bc7fb7d20973d5383ae24409
Merge: 5233a3d ea9c30e
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Thu Jan 9 16:56:51 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 16:56:51 2014 -0500
Merge topic 'ninja_fix_rerun' into next
ea9c30e Ninja generator was incorrectly marking dependencies as out of date.
diff --cc Source/cmGlobalNinjaGenerator.cxx
index ec91b0f,7ff3ef4..834ef9b
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@@ -1104,13 -1084,13 +1104,14 @@@ void cmGlobalNinjaGenerator::WriteTarge
Re-running CMake...,
Rule for re-running cmake.,
/*depfile=*/ ,
+/*deptype=*/ ,
/*rspfile=*/ ,
/*rspcontent*/ ,
- /*restat=*/ false,
+ /*restat=*/ true,
/*generator=*/ true);
- cmNinjaDeps implicitDeps;
+ cmNinjaDeps implicitDeps, outputs, temp;
+ outputs.push_back(NINJA_BUILD_FILE);
for (std::vectorcmLocalGenerator *::const_iterator i =
this-LocalGenerators.begin(); i != this-LocalGenerators.end(); ++i) {
const std::vectorstd::string lf = (*i)-GetMakefile()-GetListFiles();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea9c30e39bff5b2316bc5f6bc607a4813da8001d
commit ea9c30e39bff5b2316bc5f6bc607a4813da8001d
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Thu Jan 9 13:18:18 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Thu Jan 9 15:20:42 2014 -0500
Ninja generator was incorrectly marking dependencies as out of date.
Setting the generated as an implicit dependency of cmake caused errors when
we generated directories on machines as part of the build process. We can
fix
this by moving these to be order only dependencies.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 61d0272..7ff3ef4 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1086,27 +1086,42 @@ void
cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream os)
/*depfile=*/ ,
/*rspfile=*/ ,
/*rspcontent*/ ,
-/*restat=*/ false,
+/*restat=*/ true,
/*generator=*/ true);
- cmNinjaDeps implicitDeps;
+ cmNinjaDeps implicitDeps, outputs, temp;
+ outputs.push_back(NINJA_BUILD_FILE);
for (std::vectorcmLocalGenerator *::const_iterator i =
this-LocalGenerators.begin(); i != this-LocalGenerators.end(); ++i) {
const std::vectorstd::string lf = (*i)-GetMakefile()-GetListFiles();
implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
const std::vectorstd::string of = (*i)-GetMakefile()-GetOutputFiles();
-implicitDeps.insert(implicitDeps.end(), of.begin(), of.end());
+temp.insert(temp.end(), of.begin(), of.end());
}
+
+ //make sure nothing is in implicit depends twice
std::sort(implicitDeps.begin(), implicitDeps.end());
implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
implicitDeps.end());
implicitDeps.push_back(CMakeCache.txt);
+ //make sure nothing is in outputs depends twice
+ std::sort(temp.begin(), temp.end());
+ temp.erase(std::unique(temp.begin(), temp.end()),
+ temp.end());
+
+ //make sure that anything that is in implicitDeps is also NOT in outputs
+ std::set_difference(temp.begin(),
+ temp.end(),
+ implicitDeps.begin(),
+ implicitDeps.end(),
+ std::back_inserter(outputs));
+
this-WriteBuild(os,
Re-run CMake if any of its inputs changed.,
RERUN_CMAKE,
- /*outputs=*/ cmNinjaDeps(1, NINJA_BUILD_FILE),
+ outputs,
/*explicitDeps=*/ cmNinjaDeps(),
implicitDeps,
/*orderOnlyDeps=*/ cmNinjaDeps(),
---
Summary of changes:
Source/cmGlobalNinjaGenerator.cxx | 23 +++
1 files changed, 19 insertions(+), 4 deletions(-)
hooks/post-receive
--
[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1160-g00f53bc
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 00f53bc260ae7febd13616b1843b241dc3c07966 (commit) from 98bdd78afc4dfce9a6ef02d80a94c4b653ccd0b8 (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=00f53bc260ae7febd13616b1843b241dc3c07966 commit 00f53bc260ae7febd13616b1843b241dc3c07966 Author: Kitware Robot kwro...@kitware.com AuthorDate: Fri Jan 10 00:01:12 2014 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Fri Jan 10 00:01:12 2014 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 08ff713..3b0f3c0 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 12) -set(CMake_VERSION_TWEAK 20140109) +set(CMake_VERSION_TWEAK 20140110) #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
