[cmake-developers] [CMake 0013054]: OBJECT library support in Extra generators
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=13054 == Reported By:Brad King Assigned To:Alex Neundorf == Project:CMake Issue ID: 13054 Category: CMake Reproducibility:N/A Severity: feature Priority: none Status: assigned Target Version: CMake 2.8.8 == Date Submitted: 2012-03-20 08:27 EDT Last Modified: 2012-03-20 08:27 EDT == Summary:OBJECT library support in Extra generators Description: On 3/19/2012 5:29 PM, Alexander Neundorf wrote: On Monday 19 March 2012, Brad King wrote: We are still missing support in the Extra generators to present OBJECT libraries in the project files. They need to appear much like STATIC libraries but have no library/archive file. We request help from the contributors of Extra generators to handle them. Can you please create a ticket for each of them, and assign them to me ? I'll see that I can do the Eclipse one still for 2.8.8. CodeBlocks/QtCreator will have to wait until 2.8.9 I think. Additional Information: http://www.cmake.org/pipermail/cmake-developers/2012-March/003700.html == Issue History Date ModifiedUsername FieldChange == 2012-03-20 08:27 Brad King New Issue 2012-03-20 08:27 Brad King Status new = assigned 2012-03-20 08:27 Brad King Assigned To = Alex Neundorf == -- 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] Package Config files with COMPONENTS
On 3/19/2012 5:17 PM, Alexander Neundorf wrote:
On Monday 19 March 2012, Brad King wrote:
Thanks. I rewrote the topic on the stage to clean up the history a little
and rebase it on top of the rewritten version of the other
find_package_set_FOUND_VariableInConfigFile topic.
Hmm, I thought I had done that.
I had deleted my local find_package_set_FOUND_VariableInConfigFile branch,
then did git pull, then created a tracking branch from the remote branch, and
branched away from this.
Did you pull from origin or fetch from stage? The latter was necessary.
Please take a look at the new version of the topic.
Is there a way to see what you changed ?
Compare the old head to the new head of the branch:
$ git fetch stage --prune
$ git diff e0694f64 stage/ImprovedCOMPONENTSSupportInFindPackage2
Note that because I rebased it on the modified version of the other
topic you will see those changes too. I pasted the relevant diff
below between your version and mine.
-Brad
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 05eb07d..ef16ce8 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -99,15 +99,14 @@ void cmFindPackageCommand::GenerateDocumentation()
The QUIET option disables messages if the package cannot be found.
The MODULE option disables the second signature documented below.
The REQUIRED option stops processing with an error message if the
-package cannot be found.
+package cannot be found.
+\n
A package-specific list of required components may be listed after the
COMPONENTS option or directly after the REQUIRED option.
-A package should only be considered found if all of the listed
-components have been found.
-Additional package-specific optional components may be listed after the
-OPTIONAL_COMPONENTS option. As opposed to the COMPONENTS option, the
-result for those components does not influence whether the package as a
-whole is considered to be found.
+Additional optional components may be listed after OPTIONAL_COMPONENTS.
+Available components and their influence on whether a package is
+considered to be found are defined by the target package.
+\n
The [version] argument requests a version with which the package found
should be compatible (format is major[.minor[.patch[.tweak]]]).
The EXACT option requests that the version be matched exactly.
@@ -612,18 +611,14 @@ bool cmFindPackageCommand
std::set_intersection(requiredComponents.begin(), requiredComponents.end(),
optionalComponents.begin(), optionalComponents.end(),
std::back_inserter(doubledComponents));
-
- if(doubledComponents.size() 0)
+ if(!doubledComponents.empty())
{
-
cmOStringStream e;
-e called with the following components used for both COMPONENTS and
- OPTIONAL_COMPONENTS: ;
+e called with components that are both required and optional:\n;
for(unsigned int i=0; idoubledComponents.size(); ++i)
{
- e doubledComponents[i] ;
+ e doubledComponents[i] \n;
}
-
this-SetError(e.str().c_str());
return false;
}
--
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] Coming right up: CMake 2.8.8-rc1
Brad and I merged the latest commits on the ninja-generator branch and the object-library branch this morning. We plan to observe the green on the dashboards for the night in the Nightly 2.8 Release section, and . if all is well there, I will kick off the building of CMake 2.8.8-rc1 tomorrow. Unless, of course, somebody here has an objection for some reason? (Hopefully not, because according to my calendar, we're now 2 weeks overdue for rc1...) ;-) Thx, David -- 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 0013055]: CPACK_NSIS_MODIFY_PATH not properly interpolated in template
The following issue has been SUBMITTED. == http://www.gccxml.org/Bug/view.php?id=13055 == Reported By:plobsing Assigned To: == Project:CMake Issue ID: 13055 Category: CPack Reproducibility:have not tried Severity: minor Priority: normal Status: new == Date Submitted: 2012-03-20 11:40 EDT Last Modified: 2012-03-20 11:40 EDT == Summary:CPACK_NSIS_MODIFY_PATH not properly interpolated in template Description: CPACK_NSIS_MODIFY_PATH is not being interpolated properly in NSIS.template.in. The resulting project.nsi file always contains an empty string for the templated value, making path modification inaccessible. Steps to Reproduce: On a windows machine with CMake, Visual Studio 2008, and NSIS installed: 1) Obtain a clean copy of any cmake/cpack project. I used LLVM, but I have since reproduced this elsewhere. 2) Using the CMake GUI, configure for out of source build, with Visual Studio 2008 toolchain. 3) From the CMake GUI, set CPACK_NSIS_MODIFY_PATH to any true value (I've tried boolean TRUE, string ON, and string YES) 4) Run ALL_BUILD and PACKAGE targets. 5) Run generated installer. Note the lack of path modification dialog. Additional Information: I was able to access the path modification functionality by applying the attached patch to CPack.cmake. == Issue History Date ModifiedUsername FieldChange == 2012-03-20 11:40 plobsing New Issue 2012-03-20 11:40 plobsing File Added: cpack.cmake.diff == -- 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] Package Config files with COMPONENTS
On Tuesday 20 March 2012, Brad King wrote: On 3/19/2012 5:17 PM, Alexander Neundorf wrote: On Monday 19 March 2012, Brad King wrote: Thanks. I rewrote the topic on the stage to clean up the history a little and rebase it on top of the rewritten version of the other find_package_set_FOUND_VariableInConfigFile topic. Hmm, I thought I had done that. I had deleted my local find_package_set_FOUND_VariableInConfigFile branch, then did git pull, then created a tracking branch from the remote branch, and branched away from this. Did you pull from origin or fetch from stage? The latter was necessary. Ok, that was it. Please take a look at the new version of the topic. Is there a way to see what you changed ? Compare the old head to the new head of the branch: $ git fetch stage --prune $ git diff e0694f64 stage/ImprovedCOMPONENTSSupportInFindPackage2 Note that because I rebased it on the modified version of the other topic you will see those changes too. I pasted the relevant diff below between your version and mine. -Brad diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 05eb07d..ef16ce8 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -99,15 +99,14 @@ void cmFindPackageCommand::GenerateDocumentation() The QUIET option disables messages if the package cannot be found. The MODULE option disables the second signature documented below. The REQUIRED option stops processing with an error message if the - package cannot be found. +package cannot be found. +\n A package-specific list of required components may be listed after the COMPONENTS option or directly after the REQUIRED option. -A package should only be considered found if all of the listed -components have been found. -Additional package-specific optional components may be listed after the -OPTIONAL_COMPONENTS option. As opposed to the COMPONENTS option, the -result for those components does not influence whether the package as -a whole is considered to be found. +Additional optional components may be listed after OPTIONAL_COMPONENTS +Available components and their influence on whether a package is +considered to be found are defined by the target package. +\n I would prefer if this documentation would recommend how COMPONENTS and OPTIONAL_COMPONENTS should be handled. Ok, this is done in readme.txt, but I would prefer to have it here too. But I don't have a strong opinion on this. 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] Coming right up: CMake 2.8.8-rc1
On Tuesday 20 March 2012, David Cole wrote: Brad and I merged the latest commits on the ninja-generator branch and the object-library branch this morning. We plan to observe the green on the dashboards for the night in the Nightly 2.8 Release section, and . if all is well there, I will kick off the building of CMake 2.8.8-rc1 tomorrow. Unless, of course, somebody here has an objection for some reason? (Hopefully not, because according to my calendar, we're now 2 weeks overdue for rc1...) ;-) I know, thanks for delaying :-) The one thing I'd still like to get in for 2.8.8 (except fixes) is the ImprovedCOMPONENTSSupportInFindPackage2 branch. I hope that's still possible ? 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] 185 - CMakeOnly.AllFindModules (Failed)
On Thu, Mar 8, 2012 at 5:33 PM, Rolf Eike Beer e...@sf-mail.de wrote: David Cole wrote: Eike, I've got a test machine setup where I'm using the latest Xcode 4.3 from Apple, and I'm getting output like this from the AllFindModules test: CMake Error at CMakeLists.txt:52 (message): GIT_VERSION_STRING has unexpected content 1.7.7.5 (Apple Git-26) Is there a way to say it's ok for the version string to have extra stuff after the version number without breaking your concept of expected content too much? Really, our expectation of a version number string in CMake is anything that's useful with VERSION_LESS and VERSION_GREATER comparisons. The above string is useful, and would be valid for version comparisons. Perhaps we could use the regex you're using now, but only care about the *start* of the string? I have no problem if you change the ending to ( .*)? (or whatever is correct). It now has been proven that the expectation of what would come out of this is too narrow. On the other hand I wonder if we should simply cut away that trailing stuff in FindGit.cmake. Eike -- -- 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 I've finally committed and merged to 'next' a fix for this test: http://public.kitware.com/gitweb?p=cmake.git;a=commitdiff;h=a5ee62851973713e15147d046d7d0d4abcfdd078 See the commit message and the diff for details. Let me know if you think I've relaxed things too much, or if you disagree with any of the expectations I've encoded here. Thanks, David -- 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 0013056]: Enhance bash completion support
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=13056 == Reported By:Eric NOULARD Assigned To:Eric NOULARD == Project:CMake Issue ID: 13056 Category: CMake Reproducibility:have not tried Severity: feature Priority: normal Status: assigned == Date Submitted: 2012-03-20 23:30 CET Last Modified: 2012-03-20 23:30 CET == Summary:Enhance bash completion support Description: Igor Murzod did enhance bash completion support for cmake, cpack, ctest. We should import those enhancement into CMake. see: https://alioth.debian.org/tracker/?func=detailatid=413095aid=312632group_id=100114 and https://github.com/GArik/CMake/commit/7d63fbe952f9c4d88c44c556e03f0920fa2e6afe == Issue History Date ModifiedUsername FieldChange == 2012-03-20 23:30 Eric NOULARD New Issue 2012-03-20 23:30 Eric NOULARD Status new = assigned 2012-03-20 23:30 Eric NOULARD Assigned To = Eric NOULARD == -- 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] how to add flags to static library cmdline?
Hello! Does anyone know how to add flags to lib.exe ... ? IMy version is 2.8.7. There is no reference in docs.. Thanks! -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Working with Multiple Projects
As far as I know, you can't have two CMake projects in the same directory. Move one of the CMakeLists.txt files to a different one - either create a sudirectory for the subproject, or create a separate directory for the top-level CMakeLists.txt. Note that there is no need for directories added via ADD_SUBDIRECTORY to be actually subdirectories of the source dir. I.e. ADD_SUBDIRECTORY(../../SomeDir) is perfectly valid. Petr On Mon, Mar 19, 2012 at 4:44 PM, Hashim Mir h...@rim.com wrote: Hi there, I am currently working on transitioning over a project (that has multiple subprojects inside of it) over to Cmake. There is one thing that I am not sure about – basically, to include the subprojects from the top level CMakeLists.txt file, I just utilize the add_subdirectory command, and reference to the directories that these various subprojects are stored under. However, I have one project that is in the same directory as my top level CMakeLists.txt file, and so I am wondering if it is possible to still include this file somehow? CMake does not allow me to call add_subdirectory on the existing PROJECT_BINARY_DIR, and I cannot think of another way for me to include this subproject into my Cmake build. Thanks in advance, Hashim - This transmission (including any attachments) may contain confidential information, privileged material (including material protected by the solicitor-client or other applicable privileges), or constitute non-public information. Any use of this information by anyone other than the intended recipient is prohibited. If you have received this transmission in error, please immediately reply to the sender and delete this information from your system. Use, dissemination, distribution, or reproduction of this transmission by unintended recipients is not authorized and may be unlawful. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Couple of library/link questions
I'm trying to make a CMakeLists for libevent, and had a couple of
questions that would make it a bit cleaner:
- Other than using a macro to do { add_executable(...)
target_link_libraries(...) } is there a /clean/ way to make everything
in a subdirectory automatically link a given library?
- The makefiles I'm basing this on build libevent_core.lib,
libevent_extras.lib and then libevent.lib which is basically the two
previous libraries merged.
I wanted to do:
ADD_LIBRARY(libevent_core ${CoreSrcFiles})
ADD_LIBRARY(libevent_extras ${ExtraSrcFiles})
ADD_LIBRARY(libevent)
TARGET_LINK_LIBRARIES(libevent libevent_core libevent_extras)
but this generates a warning/error, listing the two libraries in
add_library doesn't work either.
So for now I have
ADD_LIBRARY(libevent_core ${CoreSrcFiles})
ADD_LIBRARY(libevent_extras ${ExtraSrcFiles})
ADD_LIBRARY(libevent ${CoreSrcFiles} ${ExtraSrcFiles})
but that's clumsy :)
- Oliver
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Couple of library/link questions
On 20.03.12 14:01:31, Oliver Smith wrote:
I'm trying to make a CMakeLists for libevent, and had a couple of
questions that would make it a bit cleaner:
- Other than using a macro to do { add_executable(...)
target_link_libraries(...) } is there a /clean/ way to make
everything in a subdirectory automatically link a given library?
No.
- The makefiles I'm basing this on build libevent_core.lib,
libevent_extras.lib and then libevent.lib which is basically the two
previous libraries merged.
I wanted to do:
ADD_LIBRARY(libevent_core ${CoreSrcFiles})
ADD_LIBRARY(libevent_extras ${ExtraSrcFiles})
ADD_LIBRARY(libevent)
TARGET_LINK_LIBRARIES(libevent libevent_core libevent_extras)
but this generates a warning/error, listing the two libraries in
Whats the error? It should just work.
Andreas
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Couple of library/link questions
Hi Olivier,
Assuming you have not set the flag, BUILD_SHARED_LIBS [1] set to TRUE, I
will consider you are building static libraries. If this last statement is
valid, it seems your approach is the right one.
I would also recommend you to read the following entry:
http://vtk.org/Wiki/CMake_FAQ#Does_CMake_support_.22convenience.22_libraries.3F
Hth
Jc
[1]
http://www.cmake.org/cmake/help/cmake-2-8-docs.html#variable:BUILD_SHARED_LIBS
On Tue, Mar 20, 2012 at 3:01 PM, Oliver Smith osm...@playnet.com wrote:
I'm trying to make a CMakeLists for libevent, and had a couple of
questions that would make it a bit cleaner:
- Other than using a macro to do { add_executable(...)
target_link_libraries(...) } is there a *clean* way to make everything in
a subdirectory automatically link a given library?
- The makefiles I'm basing this on build libevent_core.lib,
libevent_extras.lib and then libevent.lib which is basically the two
previous libraries merged.
I wanted to do:
ADD_LIBRARY(libevent_core ${CoreSrcFiles})
ADD_LIBRARY(libevent_extras ${ExtraSrcFiles})
ADD_LIBRARY(libevent)
TARGET_LINK_LIBRARIES(libevent libevent_core libevent_extras)
but this generates a warning/error, listing the two libraries in
add_library doesn't work either.
So for now I have
ADD_LIBRARY(libevent_core ${CoreSrcFiles})
ADD_LIBRARY(libevent_extras ${ExtraSrcFiles})
ADD_LIBRARY(libevent ${CoreSrcFiles} ${ExtraSrcFiles})
but that's clumsy :)
- Oliver
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
--
+1 919 869 8849
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, master, updated. v2.8.7-724-gb06f7c0
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 b06f7c077b15de1a2bf354b64092565d0e49d719 (commit) via 5b8983ee0124a0abd1f3072fdfc7fca852722600 (commit) from f7533740e9096d4944c378868685047e73d3afc0 (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=b06f7c077b15de1a2bf354b64092565d0e49d719 commit b06f7c077b15de1a2bf354b64092565d0e49d719 Merge: f753374 5b8983e Author: David Cole david.c...@kitware.com AuthorDate: Tue Mar 20 09:34:25 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 20 09:34:25 2012 -0400 Merge topic 'fix-docs-typos' 5b8983e Fix some typos in the docs comments. --- Summary of changes: Source/cmake.h | 10 +- 1 files changed, 5 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, master, updated. v2.8.7-763-g31c0bc0
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 31c0bc021940420fcf383bde390c59beb2cd9b9c (commit) via 93d5509b5b1c208f3ed28daf35f9384ab6918441 (commit) via 821037cf2e7847ed00e869f2188e20d84379a6db (commit) via eb24c99c4d8e2b56d8ab86ffa051558b7e14460b (commit) via 63d1be8b0007feafa69b16fb9c8682c992017c9a (commit) via 020ba38775875238f3a6ddd52486ccc5944c86fd (commit) via e8ea61587463f18dd552dc84a55d2091adff3071 (commit) via 8045e1711907951ec1cb574d7e39c0dcf6471302 (commit) via 247a132422bd3f1c97f5fcf8457d5a105ab65687 (commit) via b063599603bd3d2d3cc57495d0d060ac90f0f308 (commit) via be01f3b098a69570cc382501a3895f424c4a608f (commit) via 2693dbe085d78951f62487e37e7d75eb4cf7bfdd (commit) via 51997cb6dc93eff826e95ac326eb9af6763eaa32 (commit) via 23ec258fce110a63e3d7bde711dc127e220639d4 (commit) via 61124de4c06b1195e79ee71326b902baf23c4c32 (commit) via f5b06cda0f187929ac68ed64595c22d4e6ec773c (commit) via a2514f15fae34abb6f29dddf6f5cfe8b171a8035 (commit) via c68cc0661218c62f32d11cb600183e645c81a3de (commit) via cd146c650e092dcbf91adf60ef697608c2ac7fa2 (commit) via c3242500b62c3f81af46e086cc2225b53c023167 (commit) via db7ef82402bed3d941bea73d266ac5919f4eee15 (commit) via 5683101669e677b5b8d7b50d817da54156afd626 (commit) via 69d3d1835c5f4bdf9fbe5e920517a74d82482455 (commit) via c403f27a2de2327f5c895972e16a81d80968c40c (commit) via 34e4985eed3589a4f7ad7dfc14a7a8aa10c8ff97 (commit) via 3a53005f7dd5e582b855ef1f3c0e6814ce7d024a (commit) via 3aa741acb6b47d83a0892ddf027ddb0abdc33e78 (commit) via b87d7a60a0ed146b79c49baedb666db228d5a70f (commit) via d5aedf15a4a6d7023a7ba73dcf92b24607af4606 (commit) via f737bd416a49d79db032f97c3046e7eccc6aaea9 (commit) via 9c0a00d6dd6e7419eba61bcac30bdd0715b8b2cd (commit) via 46f49406759423dcc6f4050c9ad83c7167bd4dfc (commit) via d57047de33e096eac6fc84976c733b7941c9add3 (commit) via 3baaf6ccecb9117b613fc89cd37206960298dfaa (commit) via 62a841b80b5f4b4f9cc0ddba77ae010a29b0e27e (commit) via 45c2f93240eb0556b3a8025e154a3dea5e206c7a (commit) via 4b245580913e02ba577d6eb7825866300d364b53 (commit) via 11d9b211266865f0ce4a1005bbb18748c0806bce (commit) via 51b67366ed9d8e81567cfff1ede2b34d85410933 (commit) from b06f7c077b15de1a2bf354b64092565d0e49d719 (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=31c0bc021940420fcf383bde390c59beb2cd9b9c commit 31c0bc021940420fcf383bde390c59beb2cd9b9c Merge: b06f7c0 93d5509 Author: David Cole david.c...@kitware.com AuthorDate: Tue Mar 20 09:34:35 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 20 09:34:35 2012 -0400 Merge topic 'object-library' 93d5509 Merge branch 'ninja-object-library' into object-library 821037c Merge branch 'xcode-object-library' into object-library eb24c99 Merge branch 'object-library' into xcode-object-library 63d1be8 Xcode: Honor $TARGET_OBJECTS:... source expressions 020ba38 Merge branch 'object-library' into xcode-object-library e8ea615 Build object library targets in Xcode 8045e17 Pre-compute object file names before Xcode generation 247a132 Allow txt files as ExtraSources in object library targets b063599 Add a default source group for object files. be01f3b Xcode: Re-factor some existing methods into FromPath variants 2693dbe Merge branch 'object-library' into ninja-object-library 51997cb Ninja: Honor $TARGET_OBJECTS:... source expressions 23ec258 Merge branch 'object-library' into ninja-object-library 61124de Build object library targets in Ninja f5b06cd Pre-compute object file names before Ninja generation a2514f1 Simplify cmNinjaTargetGenerator using cmGeneratorTarget ... --- Summary of changes: Source/CMakeLists.txt |2 + Source/cmAddLibraryCommand.cxx | 14 + Source/cmAddLibraryCommand.h | 20 ++ Source/cmComputeLinkDepends.cxx| 13 + Source/cmExportCommand.cxx |8 + Source/cmGeneratorTarget.cxx | 172 ++ Source/cmGeneratorTarget.h | 63 Source/cmGlobalGenerator.cxx | 57 - Source/cmGlobalGenerator.h | 13
[Cmake-commits] CMake branch, master, updated. v2.8.7-765-gd69c2c5
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 d69c2c582584efaa34aa6e2ffc5eb80bacef1324 (commit) via c337c7e205259d5944b19c2a6d2007f490379ddc (commit) from 31c0bc021940420fcf383bde390c59beb2cd9b9c (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=d69c2c582584efaa34aa6e2ffc5eb80bacef1324 commit d69c2c582584efaa34aa6e2ffc5eb80bacef1324 Merge: 31c0bc0 c337c7e Author: David Cole david.c...@kitware.com AuthorDate: Tue Mar 20 09:34:56 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 20 09:34:56 2012 -0400 Merge topic 'ninja-generator' c337c7e Ninja: Fix OBJECT_DIR substitution --- Summary of changes: Source/cmNinjaNormalTargetGenerator.cxx |5 - 1 files changed, 4 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.7-3297-gfb33cf9
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 fb33cf9e8ec7ce98b4e4bc8a6f009383eb041587 (commit) via d69c2c582584efaa34aa6e2ffc5eb80bacef1324 (commit) via 31c0bc021940420fcf383bde390c59beb2cd9b9c (commit) via b06f7c077b15de1a2bf354b64092565d0e49d719 (commit) via f7533740e9096d4944c378868685047e73d3afc0 (commit) from e0cebaaf7fe4828f6a0e26495f0e572c67e47704 (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=fb33cf9e8ec7ce98b4e4bc8a6f009383eb041587 commit fb33cf9e8ec7ce98b4e4bc8a6f009383eb041587 Merge: e0cebaa d69c2c5 Author: David Cole david.c...@kitware.com AuthorDate: Tue Mar 20 09:35:43 2012 -0400 Commit: David Cole david.c...@kitware.com CommitDate: Tue Mar 20 09:35:43 2012 -0400 Merge branch 'master' into next --- Summary of changes: Source/kwsys/kwsysDateStamp.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.7-3300-g9c86ef6
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 9c86ef64f25f7db4714deff37b7c4b41abc48757 (commit)
via b291d9e756b76ce85ebcc314c14de532e8ad477f (commit)
via 328c0f65c2a273c6adcdb11f96ee057d80014de2 (commit)
from fb33cf9e8ec7ce98b4e4bc8a6f009383eb041587 (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=9c86ef64f25f7db4714deff37b7c4b41abc48757
commit 9c86ef64f25f7db4714deff37b7c4b41abc48757
Merge: fb33cf9 b291d9e
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 20 09:44:36 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 20 09:44:36 2012 -0400
Merge topic 'vs10-object-items' into next
b291d9e VS10: Fix external objects generated outside target (#13047)
328c0f6 Simplify cmVisualStudio10TargetGenerator source classification
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b291d9e756b76ce85ebcc314c14de532e8ad477f
commit b291d9e756b76ce85ebcc314c14de532e8ad477f
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Mar 19 17:14:52 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 20 09:01:02 2012 -0400
VS10: Fix external objects generated outside target (#13047)
Commit 9a6ff950 (Fix for bug where VS2010 did not use .obj files,
2011-04-01) assumed that if an external object is GENERATED that it is
the output of a custom command in the current target. If it is
generated by another target then VS will not automatically include the
external object in the current target. This bug was preserved by the
refactoring in the parent commit.
Instead use None for external objects generated by a custom command in
the current target and Object for all other external objects. Update
the ExternalOBJ test to cover this case.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 88ad178..6caaad1 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -857,19 +857,10 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
si = this-GeneratorTarget-ExternalObjects.begin();
si != this-GeneratorTarget-ExternalObjects.end(); ++si)
{
-// If an object file is generated, then vs10
-// will use it in the build, and we have to list
-// it as None instead of Object
-if((*si)-GetPropertyAsBool(GENERATED))
- {
- this-WriteSource(None, *si);
- }
-// If it is not a generated object then we have
-// to use the Object type
-else
- {
- this-WriteSource(Object, *si);
- }
+// If an object file is generated in this target, then vs10 will use
+// it in the build, and we have to list it as None instead of Object.
+std::vectorcmSourceFile* const* d = this-Target-GetSourceDepends(*si);
+this-WriteSource((d !d-empty())? None:Object, *si);
}
this-WriteSources(None, this-GeneratorTarget-ExtraSources);
diff --git a/Tests/ExternalOBJ/CMakeLists.txt b/Tests/ExternalOBJ/CMakeLists.txt
index f12de11..683e799 100644
--- a/Tests/ExternalOBJ/CMakeLists.txt
+++ b/Tests/ExternalOBJ/CMakeLists.txt
@@ -59,3 +59,5 @@ ADD_EXECUTABLE(ExternalOBJ executable.cxx ${CUSTOM_OBJECT})
# not didn't work. So, repeat the executable using the object
# directly and not from the output of the copy.
ADD_EXECUTABLE(ExternalOBJ2 executable.cxx ${EXTERNAL_OBJECT})
+
+ADD_SUBDIRECTORY(Sub)
diff --git a/Tests/ExternalOBJ/Sub/CMakeLists.txt
b/Tests/ExternalOBJ/Sub/CMakeLists.txt
new file mode 100644
index 000..35cd30c
--- /dev/null
+++ b/Tests/ExternalOBJ/Sub/CMakeLists.txt
@@ -0,0 +1,3 @@
+set_property(SOURCE ${CUSTOM_OBJECT} PROPERTY GENERATED 1)
+add_executable(ExternalOBJSub ../executable.cxx ${CUSTOM_OBJECT})
+add_dependencies(ExternalOBJSub ExternalOBJ) # depend on generating target
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=328c0f65c2a273c6adcdb11f96ee057d80014de2
commit 328c0f65c2a273c6adcdb11f96ee057d80014de2
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Mar 19 11:25:21 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Mar 19 17:13:41 2012 -0400
Simplify cmVisualStudio10TargetGenerator source classification
Combine WriteCLSources and WriteObjSources into a single method. Use
the cmGeneratorTarget source classification to simplify tool selection
for each source file. Extend the classification to handle .idl files.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4529d1c..7979928 100644
---
[Cmake-commits] CMake branch, next, updated. v2.8.7-3302-g10310a6
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 10310a62e06c075e713e03187d2d89c4b0e727fd (commit)
via fb7348f64455242dcbbb3837c697c9bf88414ae2 (commit)
from 9c86ef64f25f7db4714deff37b7c4b41abc48757 (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=10310a62e06c075e713e03187d2d89c4b0e727fd
commit 10310a62e06c075e713e03187d2d89c4b0e727fd
Merge: 9c86ef6 fb7348f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 20 15:18:35 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 20 15:18:35 2012 -0400
Merge topic 'watcom-object-library' into next
fb7348f Fix ObjectLibrary test on Watcom
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb7348f64455242dcbbb3837c697c9bf88414ae2
commit fb7348f64455242dcbbb3837c697c9bf88414ae2
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 20 15:06:16 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 20 15:09:57 2012 -0400
Fix ObjectLibrary test on Watcom
The Watcom compiler interprets -DB as option
-db generate browsing information
so define A_DEF and B_DEF instead of just A and B.
Skip CMAKE_SHARED_LIBRARY_C_FLAGS for Watcom because it is set to
-bd build Dynamic link library
which adds a DLL entry point to each object.
diff --git a/Tests/ObjectLibrary/A/CMakeLists.txt
b/Tests/ObjectLibrary/A/CMakeLists.txt
index e0a620e..121a8ac 100644
--- a/Tests/ObjectLibrary/A/CMakeLists.txt
+++ b/Tests/ObjectLibrary/A/CMakeLists.txt
@@ -1,10 +1,10 @@
# Add -fPIC so objects can be used in shared libraries.
# TODO: Need property for this.
-if(CMAKE_SHARED_LIBRARY_C_FLAGS)
+if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM)
set(CMAKE_C_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS})
endif()
-add_definitions(-DA)
+add_definitions(-DA_DEF)
add_custom_command(
OUTPUT a1.c
diff --git a/Tests/ObjectLibrary/A/a.h b/Tests/ObjectLibrary/A/a.h
index 6bfbc82..7259f98 100644
--- a/Tests/ObjectLibrary/A/a.h
+++ b/Tests/ObjectLibrary/A/a.h
@@ -1,6 +1,6 @@
-#ifndef A
-# error A not defined
+#ifndef A_DEF
+# error A_DEF not defined
#endif
-#ifdef B
-# error B must not be defined
+#ifdef B_DEF
+# error B_DEF must not be defined
#endif
diff --git a/Tests/ObjectLibrary/B/CMakeLists.txt
b/Tests/ObjectLibrary/B/CMakeLists.txt
index 498d45d..67172d1 100644
--- a/Tests/ObjectLibrary/B/CMakeLists.txt
+++ b/Tests/ObjectLibrary/B/CMakeLists.txt
@@ -5,11 +5,11 @@ endif()
# Add -fPIC so objects can be used in shared libraries.
# TODO: Need property for this.
-if(CMAKE_SHARED_LIBRARY_C_FLAGS)
+if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM)
set(CMAKE_C_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS})
endif()
-add_definitions(-DB)
+add_definitions(-DB_DEF)
add_library(B OBJECT b1.c b2.c)
add_library(Bexport OBJECT b1${vs6}.c b2${vs6}.c)
set_property(TARGET Bexport PROPERTY COMPILE_DEFINITIONS Bexport)
diff --git a/Tests/ObjectLibrary/B/b.h b/Tests/ObjectLibrary/B/b.h
index 632004d..11b22f4 100644
--- a/Tests/ObjectLibrary/B/b.h
+++ b/Tests/ObjectLibrary/B/b.h
@@ -1,8 +1,8 @@
-#ifdef A
-# error A must not be defined
+#ifdef A_DEF
+# error A_DEF must not be defined
#endif
-#ifndef B
-# error B not defined
+#ifndef B_DEF
+# error B_DEF not defined
#endif
#if defined(_WIN32) defined(Bexport)
# define EXPORT_B __declspec(dllexport)
---
Summary of changes:
Tests/ObjectLibrary/A/CMakeLists.txt |4 ++--
Tests/ObjectLibrary/A/a.h|8
Tests/ObjectLibrary/B/CMakeLists.txt |4 ++--
Tests/ObjectLibrary/B/b.h|8
4 files changed, 12 insertions(+), 12 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.7-3304-g954a27c
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 954a27c27832fda0e10826159c18ab08a3461346 (commit)
via 2f9ad7c6e6067b162d58d8a8628ba2c38106a6e9 (commit)
from 10310a62e06c075e713e03187d2d89c4b0e727fd (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=954a27c27832fda0e10826159c18ab08a3461346
commit 954a27c27832fda0e10826159c18ab08a3461346
Merge: 10310a6 2f9ad7c
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Mar 20 15:21:25 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 20 15:21:25 2012 -0400
Merge topic 'findmpi_look_in_implicit_dirs' into next
2f9ad7c Fix FindMPI for the intel compiler on linux by looking in implict
directories.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f9ad7c6e6067b162d58d8a8628ba2c38106a6e9
commit 2f9ad7c6e6067b162d58d8a8628ba2c38106a6e9
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Mar 20 15:18:53 2012 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Tue Mar 20 15:18:53 2012 -0400
Fix FindMPI for the intel compiler on linux by looking in implict
directories.
Use the CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES to look for libraries
that are in the -showme output from mpilang programs. This is because
some libraries reported by -showme are found there, and FindMPI will
fail if they are not found.
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 1be4ccf..ae50ca7 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -354,6 +354,20 @@ function (interrogate_mpi_compiler lang try_libs)
# Extract the set of libraries to link against from the link command
# line
string(REGEX MATCHALL (^| )-l([^\ ]+|\[^\]+\) MPI_LIBNAMES
${MPI_LINK_CMDLINE})
+# add the compiler implicit directories because some compilers
+# such as the intel compiler have libraries that show up
+# in the showme list that can only be found in the implicit
+# link directories of the compiler. Do this for C++ and C
+# compilers if the implicit link directories are defined.
+if (DEFINED CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES)
+ set(MPI_LINK_PATH
+${MPI_LINK_PATH};${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
+endif ()
+
+if (DEFINED CMAKE_C_IMPLICIT_LINK_DIRECTORIES)
+ set(MPI_LINK_PATH
+${MPI_LINK_PATH};${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
+endif ()
# Determine full path names for all of the libraries that one needs
# to link against in an MPI program
---
Summary of changes:
Modules/FindMPI.cmake | 14 ++
1 files changed, 14 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.7-3307-gf65e72c
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 f65e72c9794f4649ce6e0abe9882aba02bbeb6ad (commit)
via 86c4c93888ee275d601d31e90f2cd912e73ba46d (commit)
via 10272e6403bb73466af04c63ed6a3b97a4f70a33 (commit)
from 954a27c27832fda0e10826159c18ab08a3461346 (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=f65e72c9794f4649ce6e0abe9882aba02bbeb6ad
commit f65e72c9794f4649ce6e0abe9882aba02bbeb6ad
Merge: 954a27c 86c4c93
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 20 15:52:40 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 20 15:52:40 2012 -0400
Merge topic 'update-KWIML' into next
86c4c93 Merge branch 'upstream-kwiml' into update-KWIML
10272e6 KWIML: Avoid conflict with C++11 user-defined literals
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86c4c93888ee275d601d31e90f2cd912e73ba46d
commit 86c4c93888ee275d601d31e90f2cd912e73ba46d
Merge: d69c2c5 10272e6
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 20 15:51:11 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 20 15:51:11 2012 -0400
Merge branch 'upstream-kwiml' into update-KWIML
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10272e6403bb73466af04c63ed6a3b97a4f70a33
commit 10272e6403bb73466af04c63ed6a3b97a4f70a33
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 20 15:42:18 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 20 15:49:49 2012 -0400
KWIML: Avoid conflict with C++11 user-defined literals
Clang warns
test/test_INT_format.h:28:26: warning: identifier after literal will
be treated as a reserved user-defined literal suffix in C++11
[-Wc++11-compat-reserved-user-defined-literal]
expression [%KWIML_INT_PRI##PRI],
because the KWIML_... part is an identifier lexically immediately
following a string literal. Add a space between the string literal
and the identifier to avoid the C++11 user-defined literal syntax.
diff --git a/test/test_INT_format.h.in b/test/test_INT_format.h.in
index a8ea263..71b443d 100644
--- a/test/test_INT_format.h.in
+++ b/test/test_INT_format.h.in
@@ -25,8 +25,8 @@
T const x = VALUE(T, U); \
T y = C(V); \
printf(LANG #C :\
- expression [%@KWIML@_INT_PRI##PRI], \
- literal [%@KWIML@_INT_PRI##PRI], x, y); \
+ expression [% @KWIML@_INT_PRI##PRI ], \
+ literal [% @KWIML@_INT_PRI##PRI ], x, y); \
if(x == y)\
{ \
printf(, PASSED\n); \
@@ -42,7 +42,7 @@
{ \
T const x = VALUE(T, U); \
char const* str = STR;\
- sprintf(buf, %@KWIML@_INT_PRI##PRI, x); \
+ sprintf(buf, % @KWIML@_INT_PRI##PRI, x);\
printf(LANG @KWIML@_INT_PRI #PRI :\
expected [%s], got [%s], str, buf); \
if(strcmp(str, buf) == 0) \
@@ -62,13 +62,13 @@
T const x = VALUE(T, U); \
T y; \
char const* str = STR;\
- if(sscanf(str, %@KWIML@_INT_SCN##SCN, y) != 1) \
+ if(sscanf(str, % @KWIML@_INT_SCN##SCN, y) != 1)\
{ \
y = 0; \
} \
printf(LANG @KWIML@_INT_SCN #SCN :\
- expected [%@KWIML@_INT_PRI##PRI], \
- got [%@KWIML@_INT_PRI##PRI], x, y); \
+ expected [% @KWIML@_INT_PRI##PRI ], \
+ got [% @KWIML@_INT_PRI##PRI ], x, y); \
if(x == y)
[Cmake-commits] CMake branch, next, updated. v2.8.7-3314-g6da315f
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 6da315f20996c4a4f838269568af4c265f9cf04f (commit) via 6d100f9f469b48ad25a3958e2b4865a9d9d37523 (commit) via d81d83c218be6f8047c1c9cea63e69bc1ad4d9c0 (commit) via b15c0b418bc1239cfea1c605603e61c74023a8fb (commit) via 34108cd3b3bf992c0e77ae604125cb73e023f6a8 (commit) via cdabde82c27e4bbf6a4fb54a96b6f0af520ac761 (commit) via f2e0a18761a7b0aa16b7f22e82481aed7b160f58 (commit) from f65e72c9794f4649ce6e0abe9882aba02bbeb6ad (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=6da315f20996c4a4f838269568af4c265f9cf04f commit 6da315f20996c4a4f838269568af4c265f9cf04f Merge: f65e72c 6d100f9 Author: Alexander Neundorf neund...@kde.org AuthorDate: Tue Mar 20 15:56:51 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 20 15:56:51 2012 -0400 Merge topic 'ImprovedCOMPONENTSSupportInFindPackage2' into next 6d100f9 find_package: Test rejection of required+optional components d81d83c add macro check_required_components() to configure_package_config_file() b15c0b4 FPHSA(): add HANDLE_COMPONENTS option 34108cd find_package: add documentation for OPTIONAL_COMPONENTS cdabde8 FPHSA(): add missing ] to documentation f2e0a18 find_package: add OPTIONAL_COMPONENTS keyword http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d100f9f469b48ad25a3958e2b4865a9d9d37523 commit 6d100f9f469b48ad25a3958e2b4865a9d9d37523 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Mar 19 10:49:01 2012 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Mar 19 10:53:36 2012 -0400 find_package: Test rejection of required+optional components diff --git a/Tests/RunCMake/find_package/ComponentRequiredAndOptional-result.txt b/Tests/RunCMake/find_package/ComponentRequiredAndOptional-result.txt new file mode 100644 index 000..d00491f --- /dev/null +++ b/Tests/RunCMake/find_package/ComponentRequiredAndOptional-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/find_package/ComponentRequiredAndOptional-stderr.txt b/Tests/RunCMake/find_package/ComponentRequiredAndOptional-stderr.txt new file mode 100644 index 000..db8f512 --- /dev/null +++ b/Tests/RunCMake/find_package/ComponentRequiredAndOptional-stderr.txt @@ -0,0 +1,8 @@ +CMake Error at ComponentRequiredAndOptional.cmake:1 \(find_package\): + find_package called with components that are both required and optional: + +CompA +CompB + +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/find_package/ComponentRequiredAndOptional.cmake b/Tests/RunCMake/find_package/ComponentRequiredAndOptional.cmake new file mode 100644 index 000..0355f5a --- /dev/null +++ b/Tests/RunCMake/find_package/ComponentRequiredAndOptional.cmake @@ -0,0 +1 @@ +find_package(NotHere REQUIRED CompA CompB CompC OPTIONAL_COMPONENTS CompA CompB CompD) diff --git a/Tests/RunCMake/find_package/RunCMakeTest.cmake b/Tests/RunCMake/find_package/RunCMakeTest.cmake index 34fa733..42705b7 100644 --- a/Tests/RunCMake/find_package/RunCMakeTest.cmake +++ b/Tests/RunCMake/find_package/RunCMakeTest.cmake @@ -1,5 +1,6 @@ include(RunCMake) +run_cmake(ComponentRequiredAndOptional) run_cmake(MissingNormal) run_cmake(MissingNormalRequired) run_cmake(MissingNormalVersion) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d81d83c218be6f8047c1c9cea63e69bc1ad4d9c0 commit d81d83c218be6f8047c1c9cea63e69bc1ad4d9c0 Author: Alex Neundorf neund...@kde.org AuthorDate: Sun Mar 18 21:26:37 2012 +0100 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Mar 19 10:53:36 2012 -0400 add macro check_required_components() to configure_package_config_file() As discussed on cmake-developers, this patch adds a macro check_required_components() to the file configured via configure_package_config_file(), so for proper handling of components in Config.cmake files users can simply call check_required_components(PackageName) and this will do the right thing. Alex diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake index 98cd560..48039e5 100644 --- a/Modules/CMakePackageConfigHelpers.cmake +++ b/Modules/CMakePackageConfigHelpers.cmake @@ -2,7 +2,8 @@ # #CONFIGURE_PACKAGE_CONFIG_FILE(input output INSTALL_DESTINATION path # [PATH_VARS var1 var2 ... varN] -# [NO_SET_AND_CHECK_MACRO] ) +#
[Cmake-commits] CMake branch, next, updated. v2.8.7-3316-ge93b9ff
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 e93b9ffc78a129b0acc9f57d7a68d04711fdd1fa (commit)
via a5ee62851973713e15147d046d7d0d4abcfdd078 (commit)
from 6da315f20996c4a4f838269568af4c265f9cf04f (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=e93b9ffc78a129b0acc9f57d7a68d04711fdd1fa
commit e93b9ffc78a129b0acc9f57d7a68d04711fdd1fa
Merge: 6da315f a5ee628
Author: David Cole david.c...@kitware.com
AuthorDate: Tue Mar 20 16:25:44 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 20 16:25:44 2012 -0400
Merge topic 'fix-AllFindModules-version-check' into next
a5ee628 Tests: Relax restrictions on version variable contents
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5ee62851973713e15147d046d7d0d4abcfdd078
commit a5ee62851973713e15147d046d7d0d4abcfdd078
Author: David Cole david.c...@kitware.com
AuthorDate: Tue Mar 20 16:18:02 2012 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Tue Mar 20 16:18:02 2012 -0400
Tests: Relax restrictions on version variable contents
Our only expectation of version number variables should be that
they begin with a decimal digit for VERSION_LESS, VERSION_EQUAL
and VERSION_GREATER comparison purposes. If people put extra
blah blah after a version number like 1.2.3 (this is some super
special extra information about our funky proprietary build of
the official 1.2.3 release) then we should be ok with that.
So: now we have the following expectations for version number
variable content for the purposes of the AllFindModules test:
- it should start with a decimal digit (match ^[0-9])
- it should not be empty
- it should not be VERSION_EQUAL 0
- it should not be NOT VERSION_GREATER 0
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 22b1b7b..6604208 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -48,11 +48,21 @@ endif (NOT QT4_FOUND)
macro(check_version_string MODULE_NAME VERSION_VAR)
if (${MODULE_NAME}_FOUND)
if (DEFINED ${VERSION_VAR})
-if (NOT ${VERSION_VAR} MATCHES
^[0-9][0-9\\.]*[-A-Za-z_\\+]*[0-9\\.]*$)
-message(SEND_ERROR ${VERSION_VAR} has unexpected content
${${VERSION_VAR}})
+message(STATUS ${VERSION_VAR}='${${VERSION_VAR}}')
+if (NOT ${VERSION_VAR} MATCHES ^[0-9])
+message(SEND_ERROR unexpected: ${VERSION_VAR} does not begin
with a decimal digit)
+endif()
+if (${${VERSION_VAR}} STREQUAL )
+message(SEND_ERROR unexpected: ${VERSION_VAR} is empty)
+endif()
+if (${VERSION_VAR} VERSION_EQUAL 0)
+message(SEND_ERROR unexpected: ${VERSION_VAR} is
VERSION_EQUAL 0)
+endif()
+if (NOT ${VERSION_VAR} VERSION_GREATER 0)
+message(SEND_ERROR unexpected: ${VERSION_VAR} is NOT
VERSION_GREATER 0)
endif()
else()
-message(SEND_ERROR ${MODULE_NAME}_FOUND is set but no version
number is defined)
+message(SEND_ERROR ${MODULE_NAME}_FOUND is set but version number
variable ${VERSION_VAR} is NOT DEFINED)
endif()
endif ()
endmacro(check_version_string)
---
Summary of changes:
Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 16 +---
1 files changed, 13 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-3318-g5afdc89
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 5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569 (commit)
via 00af40b29b5170b9709b6a676bf765595d9a0aee (commit)
from e93b9ffc78a129b0acc9f57d7a68d04711fdd1fa (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=5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569
commit 5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569
Merge: e93b9ff 00af40b
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Tue Mar 20 17:09:24 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 20 17:09:24 2012 -0400
Merge topic 'UseRealPathWhenFindingEclipse' into next
00af40b Eclipse: fix #13036, make version detection work with symlinks
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00af40b29b5170b9709b6a676bf765595d9a0aee
commit 00af40b29b5170b9709b6a676bf765595d9a0aee
Author: Alex Neundorf neund...@kde.org
AuthorDate: Tue Mar 20 22:06:38 2012 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Tue Mar 20 22:06:38 2012 +0100
Eclipse: fix #13036, make version detection work with symlinks
This patch uses get_filename_component(REALPATH) so symlinks in the path
to Eclipse are resolved, which makes the version detection work in such
cases.
Alex
diff --git a/Modules/CMakeFindEclipseCDT4.cmake
b/Modules/CMakeFindEclipseCDT4.cmake
index dd06128..a4264e7 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -20,7 +20,9 @@ FIND_PROGRAM(CMAKE_ECLIPSE_EXECUTABLE NAMES eclipse DOC The
Eclipse executable
FUNCTION(_FIND_ECLIPSE_VERSION)
# This code is in a function so the variables used here have only local scope
IF(CMAKE_ECLIPSE_EXECUTABLE)
-GET_FILENAME_COMPONENT(_ECLIPSE_DIR ${CMAKE_ECLIPSE_EXECUTABLE} PATH)
+# use REALPATH to resolve symlinks
(http://public.kitware.com/Bug/view.php?id=13036)
+GET_FILENAME_COMPONENT(_REALPATH_CMAKE_ECLIPSE_EXECUTABLE
${CMAKE_ECLIPSE_EXECUTABLE} REALPATH)
+GET_FILENAME_COMPONENT(_ECLIPSE_DIR
${_REALPATH_CMAKE_ECLIPSE_EXECUTABLE} PATH)
FILE(GLOB _ECLIPSE_FEATURE_DIR
${_ECLIPSE_DIR}/features/org.eclipse.platform*)
IF(${_ECLIPSE_FEATURE_DIR} MATCHES
.+org.eclipse.platform_([0-9]+\\.[0-9]+).+)
SET(_ECLIPSE_VERSION ${CMAKE_MATCH_1})
---
Summary of changes:
Modules/CMakeFindEclipseCDT4.cmake |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, next, updated. v2.8.7-3320-g407d2b7
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 407d2b73fa3de19590943d025cec93ad7d352b6c (commit) via 1ab4b3e123ad6681f420244b4a944df550af6050 (commit) from 5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569 (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=407d2b73fa3de19590943d025cec93ad7d352b6c commit 407d2b73fa3de19590943d025cec93ad7d352b6c Merge: 5afdc89 1ab4b3e Author: Alexander Neundorf neund...@kde.org AuthorDate: Tue Mar 20 17:16:08 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 20 17:16:08 2012 -0400 Merge topic 'MinorFixForEcos' into next 1ab4b3e guard eCos.cmake against multiple inclusion (#12987) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ab4b3e123ad6681f420244b4a944df550af6050 commit 1ab4b3e123ad6681f420244b4a944df550af6050 Author: Alex Neundorf neund...@kde.org AuthorDate: Tue Mar 20 22:13:47 2012 +0100 Commit: Alex Neundorf neund...@kde.org CommitDate: Tue Mar 20 22:13:47 2012 +0100 guard eCos.cmake against multiple inclusion (#12987) Alex diff --git a/Modules/Platform/eCos.cmake b/Modules/Platform/eCos.cmake index f0881c0..b437c1a 100644 --- a/Modules/Platform/eCos.cmake +++ b/Modules/Platform/eCos.cmake @@ -1,5 +1,12 @@ # support for eCos http://ecos.sourceware.org -SET(CMAKE_SHARED_LIBRARY_C_FLAGS )# -pic + +# Guard against multiple inclusion, which e.g. leads to multiple calls to add_definition() #12987 +IF(__ECOS_CMAKE_INCLUDED) + RETURN() +ENDIF() +SET(__ECOS_CMAKE_INCLUDED TRUE) + +SET(CMAKE_SHARED_LIBRARY_C_FLAGS )# -pic SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS ) # -shared SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS ) # +s, flag for exe link to use shared lib SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG ) # -rpath --- Summary of changes: Modules/Platform/eCos.cmake |9 - 1 files changed, 8 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.7-3322-g31accb3
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 31accb307a7a6c76184468859062b6376b67323f (commit)
via 87d5f1f1a69a1bed94e65a5dd1fdfe2f05eaa772 (commit)
from 407d2b73fa3de19590943d025cec93ad7d352b6c (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=31accb307a7a6c76184468859062b6376b67323f
commit 31accb307a7a6c76184468859062b6376b67323f
Merge: 407d2b7 87d5f1f
Author: Eric Noulard eric.noul...@gmail.com
AuthorDate: Tue Mar 20 17:44:00 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 20 17:44:00 2012 -0400
Merge topic 'CPackNSIS-fixMODIFY_PATH' into next
87d5f1f CPackNSIS merge patch from bug #13055.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87d5f1f1a69a1bed94e65a5dd1fdfe2f05eaa772
commit 87d5f1f1a69a1bed94e65a5dd1fdfe2f05eaa772
Author: Eric NOULARD eric.noul...@gmail.com
AuthorDate: Tue Mar 20 22:41:10 2012 +0100
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Tue Mar 20 22:41:10 2012 +0100
CPackNSIS merge patch from bug #13055.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 571770e..e1ceed9 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -342,7 +342,7 @@ cpack_set_if_not_set(CPACK_RESOURCE_FILE_WELCOME
cpack_set_if_not_set(CPACK_MODULE_PATH ${CMAKE_MODULE_PATH})
IF(CPACK_NSIS_MODIFY_PATH)
- SET(CPACK_NSIS_MODIFY_PATH ON)
+ SET(CPACK_NSIS_MODIFY_PATH ON)
ENDIF(CPACK_NSIS_MODIFY_PATH)
SET(__cpack_system_name ${CMAKE_SYSTEM_NAME})
---
Summary of changes:
Modules/CPack.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.7-766-g45b2702
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 45b27021e56845934e996f44739b87e330346dc5 (commit) from d69c2c582584efaa34aa6e2ffc5eb80bacef1324 (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=45b27021e56845934e996f44739b87e330346dc5 commit 45b27021e56845934e996f44739b87e330346dc5 Author: KWSys Robot kwro...@kitware.com AuthorDate: Wed Mar 21 00:01:03 2012 -0400 Commit: KWSys Robot kwro...@kitware.com CommitDate: Wed Mar 21 00:05:05 2012 -0400 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 7c6e809..a3f2069 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2012) SET(KWSYS_DATE_STAMP_MONTH 03) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 20) +SET(KWSYS_DATE_STAMP_DAY 21) --- Summary of changes: Source/kwsys/kwsysDateStamp.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
