[Cmake-commits] CMake branch, master, updated. v2.8.7-150-gc6a33dc
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 c6a33dce36598b224a6e44485275022356c9ccfd (commit) via 27bc9e2631a2f7b6d78064f5adf0b528982a2de7 (commit) via 84079c92ca5c401e35aefacbcca25e0ac3e644d6 (commit) from 31c53c288c3644cc357684124e566baf9a07a1a1 (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=c6a33dce36598b224a6e44485275022356c9ccfd commit c6a33dce36598b224a6e44485275022356c9ccfd Merge: 31c53c2 27bc9e2 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:14:38 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:14:38 2012 -0500 Merge topic 'FindProtobuf_import_dirs' 27bc9e2 FindProtobuf: Update documentation comment for 2.8.8 84079c9 FindProtobuf: Merge patch that allows extra import dirs --- Summary of changes: Modules/FindProtobuf.cmake | 13 + 1 files changed, 13 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, master, updated. v2.8.7-155-g9d57dfe
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 9d57dfee6ad7b8d6eb0b7ce45256a456ddadf0d8 (commit) via bb2b264b5ed76428319a428949a54ba76f71004d (commit) via 7053a00f237c5d510a9a64566139b76ce82dffdc (commit) via 44ba7a3da8682316c8a53a266e06edceb038ef4d (commit) via 8e8672ccdbd6ddc9e0847cbab5b6d1dc6e95c5f7 (commit) from c6a33dce36598b224a6e44485275022356c9ccfd (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=9d57dfee6ad7b8d6eb0b7ce45256a456ddadf0d8 commit 9d57dfee6ad7b8d6eb0b7ce45256a456ddadf0d8 Merge: c6a33dc bb2b264 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:14:49 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:14:49 2012 -0500 Merge topic 'openssl-version' bb2b264 FindOpenSSL: also parse version number define with uppercase letters 7053a00 FindOpenSSL: only try to parse opensslv.h if it exists 44ba7a3 Merge branch 'master' of git://cmake.org/cmake into openssl-version 8e8672c FindOpenSSL: improve version number handling --- Summary of changes: Modules/FindOpenSSL.cmake | 40 1 files changed, 32 insertions(+), 8 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-172-g2e69c05
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 2e69c0534fb78ac728a4dab75d75df0eec8a6589 (commit) via 55c3435d88618d7ed935736604e7ab989cef4b28 (commit) from a1c1350a1f4c95fa9d2746da5e8528b6e6ed90b0 (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=2e69c0534fb78ac728a4dab75d75df0eec8a6589 commit 2e69c0534fb78ac728a4dab75d75df0eec8a6589 Merge: a1c1350 55c3435 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:16:22 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:16:22 2012 -0500 Merge topic 'FindPkgConfig-REQUIRED-issue-12620' 55c3435 FindPkgConfig: respect REQUIRED (#12620) --- Summary of changes: Modules/FindPkgConfig.cmake |6 ++ 1 files changed, 2 insertions(+), 4 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-174-gac1c2a0
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 ac1c2a00b1660d7581eb95f5fccb0261d91b0d83 (commit) via 26015baba36c8c48b2b72ca2b0ddb7ba0b37d6ad (commit) from 2e69c0534fb78ac728a4dab75d75df0eec8a6589 (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=ac1c2a00b1660d7581eb95f5fccb0261d91b0d83 commit ac1c2a00b1660d7581eb95f5fccb0261d91b0d83 Merge: 2e69c05 26015ba Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:16:39 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:16:39 2012 -0500 Merge topic 'FPHSA-CONFIG_MODE-doc' 26015ba FindPackageHandleStandardArgs: fix documentation --- Summary of changes: Modules/FindPackageHandleStandardArgs.cmake |6 +++--- 1 files changed, 3 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, master, updated. v2.8.7-176-g352279c
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 352279cdc28940ff116d7c63005b029fc0a9b3d4 (commit) via 1531c11168ad3e629e504af32d7ddc4435fbc3c7 (commit) from ac1c2a00b1660d7581eb95f5fccb0261d91b0d83 (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=352279cdc28940ff116d7c63005b029fc0a9b3d4 commit 352279cdc28940ff116d7c63005b029fc0a9b3d4 Merge: ac1c2a0 1531c11 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:16:52 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:16:52 2012 -0500 Merge topic 'loadcommand-test-cleanup' 1531c11 LoadCommand test: cleanup --- Summary of changes: Tests/LoadCommand/CMakeCommands/CMakeLists.txt |3 --- Tests/LoadCommand/CMakeLists.txt |6 -- Tests/LoadCommand/LoadedCommand.h.in |6 -- 3 files changed, 0 insertions(+), 15 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-182-g476679a
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 476679afaf99cb4d3f436499f0fef89f5590ca0d (commit)
via 98d20316bdf701865a3e3c4df7d378917224b8b0 (commit)
via 36d66416f4f47ecf0cf84b1618b60bb7d853f2e5 (commit)
via 0d96decdd069451c9b805e411abe0fc6225c8ee9 (commit)
via 880139a6421649b9b3ff8048418cd556e7ddf2c1 (commit)
via 9a6b102205045e457db24bd00777ef000c30e242 (commit)
from 352279cdc28940ff116d7c63005b029fc0a9b3d4 (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=476679afaf99cb4d3f436499f0fef89f5590ca0d
commit 476679afaf99cb4d3f436499f0fef89f5590ca0d
Merge: 352279c 98d2031
Author: David Cole david.c...@kitware.com
AuthorDate: Wed Jan 25 11:17:12 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 25 11:17:12 2012 -0500
Merge topic 'GetPrerequisites-rpath-OSX'
98d2031 Fix BundleUtilities test failure with space in build path.
36d6641 Fix new BundleUtilities test failure on Mac 10.4.x
0d96dec GetPrerequisites: Add test for @rpath support.
880139a GetPrerequisites: Add support for @rpath on Mac OS X.
9a6b102 GetPrerequisites: Add support for @rpath on Mac OS X.
---
Summary of changes:
Modules/GetPrerequisites.cmake | 29
Tests/BundleUtilities/CMakeLists.txt | 49
.../{testbundleutils2.cpp = testbundleutils3.cpp} |8 ++--
3 files changed, 82 insertions(+), 4 deletions(-)
copy Tests/BundleUtilities/{testbundleutils2.cpp = testbundleutils3.cpp} (60%)
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-184-gf47fea9
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 f47fea95d7e07cfa634210337036a03dae3539c9 (commit) via 3dc6f2bfb34ff90a905b10872e98c163940f456a (commit) from 476679afaf99cb4d3f436499f0fef89f5590ca0d (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=f47fea95d7e07cfa634210337036a03dae3539c9 commit f47fea95d7e07cfa634210337036a03dae3539c9 Merge: 476679a 3dc6f2b Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:17:29 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:17:29 2012 -0500 Merge topic 'find-threads-11333' 3dc6f2b FindThreads: Try pthreads with no special option first (#11333) --- Summary of changes: Modules/FindThreads.cmake | 47 ++-- 1 files changed, 28 insertions(+), 19 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-188-g055999a
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 055999a1ef5c87908f8e02f3688d0bdf5399ac51 (commit) via 7da35e655047e595b46628c9d5c569b8d71b51c0 (commit) from 30620e74770e52ff4b2b03850d3ed3f0e21921a3 (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=055999a1ef5c87908f8e02f3688d0bdf5399ac51 commit 055999a1ef5c87908f8e02f3688d0bdf5399ac51 Merge: 30620e7 7da35e6 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:17:55 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:17:55 2012 -0500 Merge topic 'emacs-mode-indent-issue-12908' 7da35e6 cmake-mode.el: Indent after multiline argument (#12908) --- Summary of changes: Docs/cmake-mode.el |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, master, updated. v2.8.7-190-g5ee225d
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 5ee225dbbd500ac316ce9750d7b5a9f4a8692c43 (commit) via ede3ec5a799768482a7bc37ac44da99817b62316 (commit) from 055999a1ef5c87908f8e02f3688d0bdf5399ac51 (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=5ee225dbbd500ac316ce9750d7b5a9f4a8692c43 commit 5ee225dbbd500ac316ce9750d7b5a9f4a8692c43 Merge: 055999a ede3ec5 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:18:03 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:18:03 2012 -0500 Merge topic 'use-pkgconfig-quiet' ede3ec5 use pkg_check_modules() quiet in other modules --- Summary of changes: Modules/FindGnuTLS.cmake |4 ++-- Modules/FindLibXml2.cmake |4 ++-- Modules/FindLibXslt.cmake |2 +- Modules/FindOpenSSL.cmake |6 ++ 4 files changed, 7 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, master, updated. v2.8.7-192-g825b9dd
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 825b9dde3d391169ad0546b4458f1d3e1bc88756 (commit) via a5fd3915c9a0562f1e97aa38692ade0200c8ba28 (commit) from 5ee225dbbd500ac316ce9750d7b5a9f4a8692c43 (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=825b9dde3d391169ad0546b4458f1d3e1bc88756 commit 825b9dde3d391169ad0546b4458f1d3e1bc88756 Merge: 5ee225d a5fd391 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:18:18 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:18:18 2012 -0500 Merge topic 'improve-libxml2' a5fd391 FindLibXml2: support version selection --- Summary of changes: Modules/FindLibXml2.cmake | 10 -- 1 files changed, 8 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.7-196-gc8b7f8e
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 c8b7f8e36503a370fce8bf873300110d65d56550 (commit) via a803a622d052e6b50873f6bf6a3ab224f656333f (commit) from 8372bd98a9d5df29a483e8b43266ed928cba9ebe (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=c8b7f8e36503a370fce8bf873300110d65d56550 commit c8b7f8e36503a370fce8bf873300110d65d56550 Merge: 8372bd9 a803a62 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:18:41 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:18:41 2012 -0500 Merge topic 'improve-findgit' a803a62 FindGit: support version number --- Summary of changes: Modules/FindGit.cmake | 17 - 1 files changed, 16 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-200-g55e7d40
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 55e7d4071f15f4a39df49ca930ca5686c8ff1494 (commit) via 7f81c48bdd7901a310744c3b65a8a975cd9cf1a6 (commit) from 1226207a6e93c1ef480c1ce7859cae1977be7eab (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=55e7d4071f15f4a39df49ca930ca5686c8ff1494 commit 55e7d4071f15f4a39df49ca930ca5686c8ff1494 Merge: 1226207 7f81c48 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:19:09 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:19:09 2012 -0500 Merge topic 'improve-findexpat' 7f81c48 FindEXPAT: support version number --- Summary of changes: Modules/FindEXPAT.cmake | 24 +++- 1 files changed, 23 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-202-gddc1eb5
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 ddc1eb5ecdc72b0ba2c4bad1a36a7a6875646248 (commit) via c1b884965f86e2622f55d261259fc2a148035f5b (commit) from 55e7d4071f15f4a39df49ca930ca5686c8ff1494 (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=ddc1eb5ecdc72b0ba2c4bad1a36a7a6875646248 commit ddc1eb5ecdc72b0ba2c4bad1a36a7a6875646248 Merge: 55e7d40 c1b8849 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:19:25 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:19:25 2012 -0500 Merge topic 'improve-findcurl' c1b8849 FindCURL: support version selection --- Summary of changes: Modules/FindCURL.cmake | 19 +++ 1 files changed, 15 insertions(+), 4 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-211-g731f996
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 731f996ce070bbba1b4913050497afa95436f2d2 (commit) via 5b6ca9fa3feb4a3c611d496b63cb72149db25cfc (commit) via 40fb00512a95dd5b07f8e767a5e2b713c7299d5f (commit) from dc3fb5ac4eeb60c489d4435e28982920fc586a8a (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=731f996ce070bbba1b4913050497afa95436f2d2 commit 731f996ce070bbba1b4913050497afa95436f2d2 Merge: dc3fb5a 5b6ca9f Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:20:00 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 11:20:00 2012 -0500 Merge topic 'improve-findbzip2' 5b6ca9f FindBZip2: add support for debug libraries (#12867) 40fb005 FindBZip2: add support for version checking --- Summary of changes: Modules/FindBZip2.cmake | 26 -- 1 files changed, 20 insertions(+), 6 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-2251-g86edc3c
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 86edc3ce1d5cb2e3cd1bd40c81cb0d4254ebc6b3 (commit) via 731f996ce070bbba1b4913050497afa95436f2d2 (commit) via dc3fb5ac4eeb60c489d4435e28982920fc586a8a (commit) via c444cf73dd3ffb7e1bea552cdea015af5f56981b (commit) via ddc1eb5ecdc72b0ba2c4bad1a36a7a6875646248 (commit) via 55e7d4071f15f4a39df49ca930ca5686c8ff1494 (commit) via 1226207a6e93c1ef480c1ce7859cae1977be7eab (commit) via c8b7f8e36503a370fce8bf873300110d65d56550 (commit) via 8372bd98a9d5df29a483e8b43266ed928cba9ebe (commit) via 825b9dde3d391169ad0546b4458f1d3e1bc88756 (commit) via 5ee225dbbd500ac316ce9750d7b5a9f4a8692c43 (commit) via 055999a1ef5c87908f8e02f3688d0bdf5399ac51 (commit) via 30620e74770e52ff4b2b03850d3ed3f0e21921a3 (commit) via f47fea95d7e07cfa634210337036a03dae3539c9 (commit) via 476679afaf99cb4d3f436499f0fef89f5590ca0d (commit) via 352279cdc28940ff116d7c63005b029fc0a9b3d4 (commit) via ac1c2a00b1660d7581eb95f5fccb0261d91b0d83 (commit) via 2e69c0534fb78ac728a4dab75d75df0eec8a6589 (commit) via a1c1350a1f4c95fa9d2746da5e8528b6e6ed90b0 (commit) via 3c5489bd0f124945022a0ff36e0915f63ea59915 (commit) via d05d71389aba168aa7cb4d95f5b22de0ce02596c (commit) via 5737cdbcbd459f4d7c270f5ed95ac698894979fd (commit) via cef75ca90944a45ced82d9a53a592b3526a408af (commit) via 9d57dfee6ad7b8d6eb0b7ce45256a456ddadf0d8 (commit) via c6a33dce36598b224a6e44485275022356c9ccfd (commit) via 31c53c288c3644cc357684124e566baf9a07a1a1 (commit) from c4abb5c845185a7a8c302a891c81d07449cefc37 (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=86edc3ce1d5cb2e3cd1bd40c81cb0d4254ebc6b3 commit 86edc3ce1d5cb2e3cd1bd40c81cb0d4254ebc6b3 Merge: c4abb5c 731f996 Author: David Cole david.c...@kitware.com AuthorDate: Wed Jan 25 11:21:10 2012 -0500 Commit: David Cole david.c...@kitware.com CommitDate: Wed Jan 25 11:21:10 2012 -0500 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-2253-gda1c1c3
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 da1c1c3067df653dbc51fb6d12ae00aebe40ec72 (commit)
via 393c2e14fbb60c18d90d82383d89a6cba59b57fe (commit)
from 86edc3ce1d5cb2e3cd1bd40c81cb0d4254ebc6b3 (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=da1c1c3067df653dbc51fb6d12ae00aebe40ec72
commit da1c1c3067df653dbc51fb6d12ae00aebe40ec72
Merge: 86edc3c 393c2e1
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 25 11:41:28 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 25 11:41:28 2012 -0500
Merge topic 'findruby-no-dummy-version' into next
393c2e1 FindRuby: do not blindly set version to 1.8.0
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=393c2e14fbb60c18d90d82383d89a6cba59b57fe
commit 393c2e14fbb60c18d90d82383d89a6cba59b57fe
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 25 17:26:43 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Wed Jan 25 17:34:09 2012 +0100
FindRuby: do not blindly set version to 1.8.0
RUBY_VERSION was always set, even if no RUBY_EXECUTABLE was found. While it
may make sense to assume a default version if we can't execute the binary,
it
certainly doesn't make sense to report a version if there is no executable
at
all.
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 5d6c98a..3fd2ded 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -139,7 +139,7 @@ ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
# try to detect which version we found. This is not too good.
-IF(NOT RUBY_VERSION_MAJOR)
+IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
# by default assume 1.8.0
SET(RUBY_VERSION_MAJOR 1)
SET(RUBY_VERSION_MINOR 8)
@@ -149,8 +149,7 @@ IF(NOT RUBY_VERSION_MAJOR)
SET(RUBY_VERSION_MAJOR 1)
SET(RUBY_VERSION_MINOR 9)
ENDIF(${RUBY_EXECUTABLE} MATCHES ruby1.?9 OR RUBY_HDR_DIR)
-ENDIF(NOT RUBY_VERSION_MAJOR)
-
+ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
SET(RUBY_VERSION
${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH})
SET(_RUBY_VERSION_SHORT ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR})
---
Summary of changes:
Modules/FindRuby.cmake |5 ++---
1 files changed, 2 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-2259-g8f6a445
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 8f6a445ce9be7175797a5a809e97342af0f442a6 (commit)
via 680fecf1cf0886c523d5bd48e7445c3724d7fd93 (commit)
from 36c3e77609a978b115fb1c8a0d6006ace23385f1 (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=8f6a445ce9be7175797a5a809e97342af0f442a6
commit 8f6a445ce9be7175797a5a809e97342af0f442a6
Merge: 36c3e77 680fecf
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 25 12:16:21 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 25 12:16:21 2012 -0500
Merge topic 'findruby-no-dummy-version' into next
680fecf FindRuby: fix syntax errors if ruby is not installed
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=680fecf1cf0886c523d5bd48e7445c3724d7fd93
commit 680fecf1cf0886c523d5bd48e7445c3724d7fd93
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 25 18:16:05 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Wed Jan 25 18:16:05 2012 +0100
FindRuby: fix syntax errors if ruby is not installed
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 3fd2ded..c4adfd1 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -151,10 +151,12 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
ENDIF(${RUBY_EXECUTABLE} MATCHES ruby1.?9 OR RUBY_HDR_DIR)
ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-SET(RUBY_VERSION
${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH})
-SET(_RUBY_VERSION_SHORT ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR})
-SET(_RUBY_VERSION_SHORT_NODOT ${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR})
-SET(_RUBY_NODOT_VERSION
${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH})
+IF(RUBY_VERSION_MAJOR)
+ SET(RUBY_VERSION
${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH})
+ SET(_RUBY_VERSION_SHORT ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR})
+ SET(_RUBY_VERSION_SHORT_NODOT ${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR})
+ SET(_RUBY_NODOT_VERSION
${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH})
+ENDIF(RUBY_VERSION_MAJOR)
FIND_PATH(RUBY_INCLUDE_DIR
NAMES ruby.h
@@ -166,7 +168,7 @@ FIND_PATH(RUBY_INCLUDE_DIR
SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
# if ruby 1.8 is required or if ruby 1.8 was found, search for the
config.h dir
-IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
+IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
FIND_PATH(RUBY_CONFIG_INCLUDE_DIR
NAMES ruby/config.h config.h
HINTS
@@ -175,7 +177,7 @@ IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT
)
SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
-ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
+ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
# Determine the list of possible names for the ruby library
---
Summary of changes:
Modules/FindRuby.cmake | 14 --
1 files changed, 8 insertions(+), 6 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-2263-ga50d29c
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 a50d29c3e955b9409c4a1c260d869036f37b9e4d (commit)
via 0051506aa4ea3e1fdbe5333b529a0a5af9476be5 (commit)
from 5338178fafd77e2d027f5f70dbb23f941a4e23ca (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=a50d29c3e955b9409c4a1c260d869036f37b9e4d
commit a50d29c3e955b9409c4a1c260d869036f37b9e4d
Merge: 5338178 0051506
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 25 12:29:13 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 25 12:29:13 2012 -0500
Merge topic 'improve-findpng' into next
0051506 FindPNG: support version selection
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0051506aa4ea3e1fdbe5333b529a0a5af9476be5
commit 0051506aa4ea3e1fdbe5333b529a0a5af9476be5
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 25 18:24:44 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Wed Jan 25 18:24:57 2012 +0100
FindPNG: support version selection
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index f616973..a6c181c 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -7,6 +7,7 @@
# PNG_LIBRARIES, the libraries to link against to use PNG.
# PNG_DEFINITIONS - You should add_definitons(${PNG_DEFINITIONS}) before
compiling code that includes png library files.
# PNG_FOUND, If false, do not try to use PNG.
+# PNG_VERSION_STRING - the version of the PNG library found (since CMake
2.8.8)
# Also defined, but not for general use are
# PNG_LIBRARY, where to find the PNG library.
# For backward compatiblity the variable PNG_INCLUDE_DIR is also set. It has
the same value as PNG_INCLUDE_DIRS.
@@ -56,11 +57,19 @@ if(ZLIB_FOUND)
endif (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
+ if (PNG_PNG_INCLUDE_DIR AND EXISTS ${PNG_PNG_INCLUDE_DIR}/png.h)
+ file(STRINGS ${PNG_PNG_INCLUDE_DIR}/png.h png_version_str REGEX
^#define[ \t]+PNG_LIBPNG_VER_STRING[ \t]+\.+\)
+
+ string(REGEX REPLACE ^#define[ \t]+PNG_LIBPNG_VER_STRING[
\t]+\([^\]+)\.* \\1 PNG_VERSION_STRING ${png_version_str})
+ unset(png_version_str)
+ endif (PNG_PNG_INCLUDE_DIR AND EXISTS ${PNG_PNG_INCLUDE_DIR}/png.h)
endif(ZLIB_FOUND)
# handle the QUIETLY and REQUIRED arguments and set PNG_FOUND to TRUE if
# all listed variables are TRUE
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(PNG DEFAULT_MSG PNG_LIBRARY
PNG_PNG_INCLUDE_DIR)
+find_package_handle_standard_args(PNG
+ REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR
+ VERSION_VAR PNG_VERSION_STRING)
mark_as_advanced(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )
---
Summary of changes:
Modules/FindPNG.cmake | 11 ++-
1 files changed, 10 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-2265-g62d2fd6
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 62d2fd6dcd199f67a0c3ef5c279384d17fdbcfaa (commit)
via e01fe583b80208b1cd28f429cfac9c866453a994 (commit)
from a50d29c3e955b9409c4a1c260d869036f37b9e4d (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=62d2fd6dcd199f67a0c3ef5c279384d17fdbcfaa
commit 62d2fd6dcd199f67a0c3ef5c279384d17fdbcfaa
Merge: a50d29c e01fe58
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 25 12:37:38 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 25 12:37:38 2012 -0500
Merge topic 'improve-findtclsh' into next
e01fe58 FindTclsh: support version selection
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e01fe583b80208b1cd28f429cfac9c866453a994
commit e01fe583b80208b1cd28f429cfac9c866453a994
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 25 18:37:00 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Wed Jan 25 18:37:25 2012 +0100
FindTclsh: support version selection
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 13f32f8..f2c776f 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -48,10 +48,14 @@ INCLUDE(CMakeFindFrameworks)
INCLUDE(FindTclsh)
INCLUDE(FindWish)
-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH ${TCL_TCLSH} PATH)
-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT ${TCL_TCLSH_PATH} PATH)
-STRING(REGEX REPLACE
- ^.*tclsh([0-9]\\.*[0-9]).*$ \\1 TCL_TCLSH_VERSION ${TCL_TCLSH})
+IF(TCLSH_VERSION_STRING)
+ SET(TCL_TCLSH_VERSION ${TCLSH_VERSION_STRING})
+ELSE(TCLSH_VERSION_STRING)
+ GET_FILENAME_COMPONENT(TCL_TCLSH_PATH ${TCL_TCLSH} PATH)
+ GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT ${TCL_TCLSH_PATH} PATH)
+ STRING(REGEX REPLACE
+^.*tclsh([0-9]\\.*[0-9]).*$ \\1 TCL_TCLSH_VERSION ${TCL_TCLSH})
+ENDIF(TCLSH_VERSION_STRING)
GET_FILENAME_COMPONENT(TK_WISH_PATH ${TK_WISH} PATH)
GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT ${TK_WISH_PATH} PATH)
diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake
index 8fde59e..a45f285 100644
--- a/Modules/FindTclsh.cmake
+++ b/Modules/FindTclsh.cmake
@@ -82,9 +82,19 @@ FIND_PROGRAM(TCL_TCLSH
HINTS ${TCLTK_POSSIBLE_BIN_PATHS}
)
+IF(TCL_TCLSH)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E echo puts \$tcl_version
+ COMMAND ${TCL_TCLSH}
+ OUTPUT_VARIABLE TCLSH_VERSION_STRING
+ ERROR_QUIET
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ENDIF(TCL_TCLSH)
+
# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tclsh DEFAULT_MSG TCL_TCLSH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tclsh
+ REQUIRED_VARS TCL_TCLSH
+ VERSION_VAR TCLSH_VERSION_STRING)
MARK_AS_ADVANCED(TCL_TCLSH)
---
Summary of changes:
Modules/FindTCL.cmake | 12
Modules/FindTclsh.cmake | 12 +++-
2 files changed, 19 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.7-2268-g477edad
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 477edad8eb9f1d13e5e405766c2a363df6a7ecc8 (commit) via f9c1c6225c4366918465b86e4c6976ecc266245f (commit) via ca39c5cdd1ca28516791e00f213d6dee2179c6df (commit) from 62d2fd6dcd199f67a0c3ef5c279384d17fdbcfaa (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=477edad8eb9f1d13e5e405766c2a363df6a7ecc8 commit 477edad8eb9f1d13e5e405766c2a363df6a7ecc8 Merge: 62d2fd6 f9c1c62 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jan 25 14:44:16 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 14:44:16 2012 -0500 Merge topic 'imported-target-visibility' into next f9c1c62 Add test covering imported target scope rules ca39c5c Optionally allow IMPORTED targets to be globally visible http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9c1c6225c4366918465b86e4c6976ecc266245f commit f9c1c6225c4366918465b86e4c6976ecc266245f Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jan 25 14:04:26 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jan 25 14:43:07 2012 -0500 Add test covering imported target scope rules diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt index 20e6a3a..96b9972 100644 --- a/Tests/CMakeOnly/CMakeLists.txt +++ b/Tests/CMakeOnly/CMakeLists.txt @@ -16,3 +16,5 @@ add_CMakeOnly_test(CheckSymbolExists) add_CMakeOnly_test(CheckCXXSymbolExists) add_CMakeOnly_test(AllFindModules) + +add_CMakeOnly_test(TargetScope) diff --git a/Tests/CMakeOnly/TargetScope/CMakeLists.txt b/Tests/CMakeOnly/TargetScope/CMakeLists.txt new file mode 100644 index 000..fa5d8e2 --- /dev/null +++ b/Tests/CMakeOnly/TargetScope/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required (VERSION 2.8) +project(TargetScope NONE) + +add_subdirectory(Sub) + +if(TARGET SubLibLocal) + message(FATAL_ERROR SubLibLocal visible in top directory) +endif() +if(NOT TARGET SubLibGlobal) + message(FATAL_ERROR SubLibGlobal not visible in top directory) +endif() + +add_subdirectory(Sib) diff --git a/Tests/CMakeOnly/TargetScope/Sib/CMakeLists.txt b/Tests/CMakeOnly/TargetScope/Sib/CMakeLists.txt new file mode 100644 index 000..7f6f4e8 --- /dev/null +++ b/Tests/CMakeOnly/TargetScope/Sib/CMakeLists.txt @@ -0,0 +1,6 @@ +if(TARGET SubLibLocal) + message(FATAL_ERROR SubLibLocal visible in sibling directory) +endif() +if(NOT TARGET SubLibGlobal) + message(FATAL_ERROR SubLibGlobal not visible in sibling directory) +endif() diff --git a/Tests/CMakeOnly/TargetScope/Sub/CMakeLists.txt b/Tests/CMakeOnly/TargetScope/Sub/CMakeLists.txt new file mode 100644 index 000..27318f5 --- /dev/null +++ b/Tests/CMakeOnly/TargetScope/Sub/CMakeLists.txt @@ -0,0 +1,9 @@ +add_library(SubLibLocal UNKNOWN IMPORTED) +add_library(SubLibGlobal UNKNOWN IMPORTED GLOBAL) +add_subdirectory(Sub) +if(NOT TARGET SubLibLocal) + message(FATAL_ERROR SubLibLocal not visible in own directory) +endif() +if(NOT TARGET SubLibGlobal) + message(FATAL_ERROR SubLibGlobal not visible in own directory) +endif() diff --git a/Tests/CMakeOnly/TargetScope/Sub/Sub/CMakeLists.txt b/Tests/CMakeOnly/TargetScope/Sub/Sub/CMakeLists.txt new file mode 100644 index 000..a351daa --- /dev/null +++ b/Tests/CMakeOnly/TargetScope/Sub/Sub/CMakeLists.txt @@ -0,0 +1,6 @@ +if(NOT TARGET SubLibLocal) + message(FATAL_ERROR SubLibLocal not visible in subdirectory) +endif() +if(NOT TARGET SubLibGlobal) + message(FATAL_ERROR SubLibGlobal not visible in subdirectory) +endif() http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca39c5cdd1ca28516791e00f213d6dee2179c6df commit ca39c5cdd1ca28516791e00f213d6dee2179c6df Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jan 25 13:39:26 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jan 25 14:42:31 2012 -0500 Optionally allow IMPORTED targets to be globally visible Consider the case motivating commit e01cce28 (Allow add_dependencies() on imported targets, 2010-11-19). An imported target references a file generated at build time by a custom target on which it depends. Had the file been built directly using add_library or add_executable its target name would have been visible globally. Therefore the imported target representing the file should be globally visible also. Teach the IMPORTED signature of add_(executable|library) to accept a new GLOBAL option to make the imported target visible globally. diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx index bac2430..6dd8e5c
[Cmake-commits] CMake branch, next, updated. v2.8.7-2270-g3a3bf6b
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 3a3bf6b45c55b8634821508d5e889d649767b6f3 (commit) via 7d20619fbea357103f44ee219923d44922cf9641 (commit) from 477edad8eb9f1d13e5e405766c2a363df6a7ecc8 (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=3a3bf6b45c55b8634821508d5e889d649767b6f3 commit 3a3bf6b45c55b8634821508d5e889d649767b6f3 Merge: 477edad 7d20619 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jan 25 16:27:22 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 25 16:27:22 2012 -0500 Merge topic 'doc-IMPORTED-properties' into next 7d20619 Clarify IMPORTED_ target property documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d20619fbea357103f44ee219923d44922cf9641 commit 7d20619fbea357103f44ee219923d44922cf9641 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jan 25 16:17:43 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jan 25 16:26:40 2012 -0500 Clarify IMPORTED_ target property documentation These properties are meant to be set to tell CMake something, not read to get information from CMake. diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 6a937b8..1a68cee 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -323,7 +323,8 @@ void cmTarget::DefineProperties(cmake *cm) cm-DefineProperty (IMPORTED_CONFIGURATIONS, cmProperty::TARGET, Configurations provided for an IMPORTED target., - Lists configuration names available for an IMPORTED target. + Set this to the list of configuration names available for an + IMPORTED target. The names correspond to configurations defined in the project from which the target is imported. If the importing project uses a different set of configurations @@ -334,14 +335,12 @@ void cmTarget::DefineProperties(cmake *cm) cm-DefineProperty (IMPORTED_IMPLIB, cmProperty::TARGET, Full path to the import library for an IMPORTED target., - Specifies the location of the \.lib\ part of a windows DLL. + Set this to the location of the \.lib\ part of a windows DLL. Ignored for non-imported targets.); cm-DefineProperty (IMPORTED_IMPLIB_CONFIG, cmProperty::TARGET, - Per-configuration version of IMPORTED_IMPLIB property., - This property is used when loading settings for the CONFIG - configuration of an imported target. + CONFIG-specific version of IMPORTED_IMPLIB property., Configuration names correspond to those provided by the project from which the target is imported.); @@ -351,8 +350,10 @@ void cmTarget::DefineProperties(cmake *cm) Shared libraries may be linked to other shared libraries as part of their implementation. On some platforms the linker searches for the dependent libraries of shared libraries they are including - in the link. This property lists - the dependent shared libraries of an imported library. The list + in the link. + Set this property to the list of dependent shared libraries of an + imported library. + The list should be disjoint from the list of interface libraries in the IMPORTED_LINK_INTERFACE_LIBRARIES property. On platforms requiring dependent shared libraries to be found at link time CMake uses this @@ -361,9 +362,7 @@ void cmTarget::DefineProperties(cmake *cm) cm-DefineProperty (IMPORTED_LINK_DEPENDENT_LIBRARIES_CONFIG, cmProperty::TARGET, - Per-configuration version of IMPORTED_LINK_DEPENDENT_LIBRARIES., - This property is used when loading settings for the CONFIG - configuration of an imported target. + CONFIG-specific version of IMPORTED_LINK_DEPENDENT_LIBRARIES., Configuration names correspond to those provided by the project from which the target is imported. If set, this property completely overrides the generic property @@ -372,8 +371,8 @@ void cmTarget::DefineProperties(cmake *cm) cm-DefineProperty (IMPORTED_LINK_INTERFACE_LIBRARIES, cmProperty::TARGET, Transitive link interface of an IMPORTED target., - Lists libraries whose interface is included when an IMPORTED library - target is linked to another target. + Set this to the list of libraries whose interface is included when + an IMPORTED library target is linked to another target. The libraries will be included on the link line for the target. Unlike the LINK_INTERFACE_LIBRARIES property, this property applies to all imported
[Cmake-commits] CMake branch, master, updated. v2.8.7-212-g208569f
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 208569f1da0cf2c481f4b377ad4fe542a3a74e2a (commit) from 731f996ce070bbba1b4913050497afa95436f2d2 (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=208569f1da0cf2c481f4b377ad4fe542a3a74e2a commit 208569f1da0cf2c481f4b377ad4fe542a3a74e2a Author: KWSys Robot kwro...@kitware.com AuthorDate: Thu Jan 26 00:05:05 2012 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Thu Jan 26 00:05:05 2012 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 764dc38..edce102 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 01) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 25) +SET(KWSYS_DATE_STAMP_DAY 26) --- 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-2272-g2595ea7
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 2595ea7bdabf97d1a0978ad06ae122fcdb3d823e (commit)
via 409aeafa2518a1cd38709810ba765860ef21aeb8 (commit)
from 3a3bf6b45c55b8634821508d5e889d649767b6f3 (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=2595ea7bdabf97d1a0978ad06ae122fcdb3d823e
commit 2595ea7bdabf97d1a0978ad06ae122fcdb3d823e
Merge: 3a3bf6b 409aeaf
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Thu Jan 26 02:56:48 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 26 02:56:48 2012 -0500
Merge topic 'findruby-no-dummy-version' into next
409aeaf FindRuby: do not blindly set version to 1.8.0
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=409aeafa2518a1cd38709810ba765860ef21aeb8
commit 409aeafa2518a1cd38709810ba765860ef21aeb8
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 25 17:26:43 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Wed Jan 25 18:33:08 2012 +0100
FindRuby: do not blindly set version to 1.8.0
RUBY_VERSION was always set, even if no RUBY_EXECUTABLE was found. While it
may make sense to assume a default version if we can't execute the binary,
it
certainly doesn't make sense to report a version if there is no executable
at
all.
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 5d6c98a..c4adfd1 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -139,7 +139,7 @@ ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
# try to detect which version we found. This is not too good.
-IF(NOT RUBY_VERSION_MAJOR)
+IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
# by default assume 1.8.0
SET(RUBY_VERSION_MAJOR 1)
SET(RUBY_VERSION_MINOR 8)
@@ -149,13 +149,14 @@ IF(NOT RUBY_VERSION_MAJOR)
SET(RUBY_VERSION_MAJOR 1)
SET(RUBY_VERSION_MINOR 9)
ENDIF(${RUBY_EXECUTABLE} MATCHES ruby1.?9 OR RUBY_HDR_DIR)
-ENDIF(NOT RUBY_VERSION_MAJOR)
+ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-
-SET(RUBY_VERSION
${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH})
-SET(_RUBY_VERSION_SHORT ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR})
-SET(_RUBY_VERSION_SHORT_NODOT ${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR})
-SET(_RUBY_NODOT_VERSION
${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH})
+IF(RUBY_VERSION_MAJOR)
+ SET(RUBY_VERSION
${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH})
+ SET(_RUBY_VERSION_SHORT ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR})
+ SET(_RUBY_VERSION_SHORT_NODOT ${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR})
+ SET(_RUBY_NODOT_VERSION
${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH})
+ENDIF(RUBY_VERSION_MAJOR)
FIND_PATH(RUBY_INCLUDE_DIR
NAMES ruby.h
@@ -167,7 +168,7 @@ FIND_PATH(RUBY_INCLUDE_DIR
SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
# if ruby 1.8 is required or if ruby 1.8 was found, search for the
config.h dir
-IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
+IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
FIND_PATH(RUBY_CONFIG_INCLUDE_DIR
NAMES ruby/config.h config.h
HINTS
@@ -176,7 +177,7 @@ IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT
)
SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
-ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
+ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
# Determine the list of possible names for the ruby library
---
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
