[Cmake-commits] CMake branch, master, updated. v3.6.1-717-gd6734ee
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 d6734eeb875ceca5d810e829ca90541918dca2b4 (commit) from 81c3e637ccc135068a06fa3dc72f23733f003db5 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6734eeb875ceca5d810e829ca90541918dca2b4 commit d6734eeb875ceca5d810e829ca90541918dca2b4 Author: Kitware Robot AuthorDate: Thu Aug 25 00:01:04 2016 -0400 Commit: Kitware Robot CommitDate: Thu Aug 25 00:01:04 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index aabc839..d26debc 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 6) -set(CMake_VERSION_PATCH 20160824) +set(CMake_VERSION_PATCH 20160825) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1419-g9619967
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 96199676e0d3a8d14480b781b5e0534b2d342006 (commit) via f1e447467da748ba794f001c72cb0df5aea175d7 (commit) from d64488359696c8ad9519daff699ac9f1d93b2b4f (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96199676e0d3a8d14480b781b5e0534b2d342006 commit 96199676e0d3a8d14480b781b5e0534b2d342006 Merge: d644883 f1e4474 Author: Daniel Pfeifer AuthorDate: Wed Aug 24 16:25:11 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 16:25:11 2016 -0400 Merge topic 'include-what-you-use' into next f1e44746 fixup! CTest: fix include-what-you-use violations https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1e447467da748ba794f001c72cb0df5aea175d7 commit f1e447467da748ba794f001c72cb0df5aea175d7 Author: Daniel Pfeifer AuthorDate: Wed Aug 24 22:24:57 2016 +0200 Commit: Daniel Pfeifer CommitDate: Wed Aug 24 22:24:57 2016 +0200 fixup! CTest: fix include-what-you-use violations diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 7c42fd0..67f7c89 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -29,6 +29,12 @@ #include #include +#if defined(CTEST_USE_XMLRPC) +#include "cmVersion.h" +#include +#include +#endif + #define SUBMIT_TIMEOUT_IN_SECONDS_DEFAULT 120 typedef std::vector cmCTestSubmitHandlerVectorOfChar; --- Summary of changes: Source/CTest/cmCTestSubmitHandler.cxx |6 ++ 1 file changed, 6 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1417-gd644883
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 d64488359696c8ad9519daff699ac9f1d93b2b4f (commit) via d0c8e915ef09b5596befa7b7b05e2b1ae189141d (commit) from a03507820e8b11bc65bd678433c173b92b3549f6 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d64488359696c8ad9519daff699ac9f1d93b2b4f commit d64488359696c8ad9519daff699ac9f1d93b2b4f Merge: a035078 d0c8e91 Author: Stephen Kelly AuthorDate: Wed Aug 24 16:11:17 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 16:11:17 2016 -0400 Merge topic 'extract-cmMessenger' into next d0c8e915 fixup! cmMessenger: Extract from cmake class https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0c8e915ef09b5596befa7b7b05e2b1ae189141d commit d0c8e915ef09b5596befa7b7b05e2b1ae189141d Author: Stephen Kelly AuthorDate: Wed Aug 24 22:07:44 2016 +0200 Commit: Stephen Kelly CommitDate: Wed Aug 24 22:07:44 2016 +0200 fixup! cmMessenger: Extract from cmake class diff --git a/bootstrap b/bootstrap index 742fa2b..6c6713e 100755 --- a/bootstrap +++ b/bootstrap @@ -266,6 +266,7 @@ CMAKE_CXX_SOURCES="\ cmPropertyDefinition \ cmPropertyDefinitionMap \ cmMakefile \ + cmMessenger \ cmExportBuildFileGenerator \ cmExportFileGenerator \ cmExportInstallFileGenerator \ --- Summary of changes: bootstrap |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1415-ga035078
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 a03507820e8b11bc65bd678433c173b92b3549f6 (commit)
via 182a9161f714d4f122cc4c2d31abc0d795f2f9e4 (commit)
from 0ad6db5d64d0a4554c57603f3e5be4c4d9ce2f7e (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a03507820e8b11bc65bd678433c173b92b3549f6
commit a03507820e8b11bc65bd678433c173b92b3549f6
Merge: 0ad6db5 182a916
Author: Daniel Pfeifer
AuthorDate: Wed Aug 24 16:02:45 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 16:02:45 2016 -0400
Merge topic 'include-what-you-use' into next
182a9161 CTest: fix include-what-you-use violations
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=182a9161f714d4f122cc4c2d31abc0d795f2f9e4
commit 182a9161f714d4f122cc4c2d31abc0d795f2f9e4
Author: Daniel Pfeifer
AuthorDate: Wed Aug 24 22:01:40 2016 +0200
Commit: Daniel Pfeifer
CommitDate: Wed Aug 24 22:02:22 2016 +0200
CTest: fix include-what-you-use violations
diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx
index 7baf7a3..413cada 100644
--- a/Source/CTest/cmCTestBZR.cxx
+++ b/Source/CTest/cmCTestBZR.cxx
@@ -12,12 +12,18 @@
#include "cmCTestBZR.h"
#include "cmCTest.h"
+#include "cmCTestVC.h"
+#include "cmProcessTools.h"
#include "cmSystemTools.h"
#include "cmXMLParser.h"
-#include
-
#include
+#include
+#include
+#include
+#include
+#include
+#include
extern "C" int cmBZRXMLParserUnknownEncodingHandler(void* /*unused*/,
const XML_Char* name,
diff --git a/Source/CTest/cmCTestBZR.h b/Source/CTest/cmCTestBZR.h
index 0f05d38..e2ee8b7 100644
--- a/Source/CTest/cmCTestBZR.h
+++ b/Source/CTest/cmCTestBZR.h
@@ -12,8 +12,15 @@
#ifndef cmCTestBZR_h
#define cmCTestBZR_h
+#include
+
#include "cmCTestGlobalVC.h"
+#include
+#include
+
+class cmCTest;
+
/** \class cmCTestBZR
* \brief Interaction with bzr command-line tool
*
@@ -41,13 +48,14 @@ private:
// Parsing helper classes.
class InfoParser;
- class RevnoParser;
class LogParser;
- class UpdateParser;
+ class RevnoParser;
class StatusParser;
+ class UpdateParser;
+
friend class InfoParser;
- friend class RevnoParser;
friend class LogParser;
+ friend class RevnoParser;
friend class UpdateParser;
friend class StatusParser;
};
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx
b/Source/CTest/cmCTestBatchTestHandler.cxx
index 70f84cb..bf4ead4 100644
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ b/Source/CTest/cmCTestBatchTestHandler.cxx
@@ -13,10 +13,14 @@
#include "cmCTestBatchTestHandler.h"
#include "cmCTest.h"
+#include "cmCTestMultiProcessHandler.h"
+#include "cmCTestTestHandler.h"
#include "cmProcess.h"
-#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
-#include
+
+#include
+#include
+#include
cmCTestBatchTestHandler::~cmCTestBatchTestHandler()
{
diff --git a/Source/CTest/cmCTestBatchTestHandler.h
b/Source/CTest/cmCTestBatchTestHandler.h
index 17cc234..da10824 100644
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/Source/CTest/cmCTestBatchTestHandler.h
@@ -13,12 +13,11 @@
#ifndef cmCTestBatchTestHandler_h
#define cmCTestBatchTestHandler_h
-#include
+#include
#include
-#include
-#include
#include
+#include
/** \class cmCTestBatchTestHandler
* \brief run parallel ctest
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx
b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index 9dab98a..9da2848 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -17,7 +17,9 @@
#include "cmGlobalGenerator.h"
#include "cmSystemTools.h"
#include "cmake.h"
+
#include
+#include
cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler()
{
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.h
b/Source/CTest/cmCTestBuildAndTestHandler.h
index 2aa90a4..f917fb0 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.h
+++ b/Source/CTest/cmCTestBuildAndTestHandler.h
@@ -13,8 +13,15 @@
#ifndef cmCTestBuildAndTestHandler_h
#define cmCTestBuildAndTestHandler_h
+#include
+
#include "cmCTestGenericHandler.h"
-#include "cmListFileCache.h"
+#include "cmTypeMacro.h"
+
+#include
+#include
+#include
+#include
class cmake;
diff --git a/Source/CTest/cmCTestBuildCommand.cxx
b/Source/CTest/cmCTestBuildCommand.cxx
index 408a1a8..91603d7 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -15,8 +15,15 @@
#include "cmCTestBuildHandler.h"
#include "cmCTestGenericHandler.h"
#include "cmGlobalGenerator.h"
+#
[Cmake-commits] CMake branch, next, updated. v3.6.1-1413-g0ad6db5
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 0ad6db5d64d0a4554c57603f3e5be4c4d9ce2f7e (commit) via c6eb99abd626f42c980712ac9732eae0489149fa (commit) from 873ec699047784aa9072e8fb471aa597e573d084 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ad6db5d64d0a4554c57603f3e5be4c4d9ce2f7e commit 0ad6db5d64d0a4554c57603f3e5be4c4d9ce2f7e Merge: 873ec69 c6eb99a Author: Brad King AuthorDate: Wed Aug 24 15:54:38 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 15:54:38 2016 -0400 Merge topic 'extract-cmMessenger' into next c6eb99ab fixup! Parser: Issue messages through cmake, not cmSystemTools https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6eb99abd626f42c980712ac9732eae0489149fa commit c6eb99abd626f42c980712ac9732eae0489149fa Author: Brad King AuthorDate: Wed Aug 24 15:54:19 2016 -0400 Commit: Brad King CommitDate: Wed Aug 24 15:54:19 2016 -0400 fixup! Parser: Issue messages through cmake, not cmSystemTools diff --git a/Tests/RunCMake/Syntax/UnterminatedBracket0-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBracket0-stderr.txt index 2fca570..de33f7d 100644 --- a/Tests/RunCMake/Syntax/UnterminatedBracket0-stderr.txt +++ b/Tests/RunCMake/Syntax/UnterminatedBracket0-stderr.txt @@ -3,3 +3,5 @@ CMake Error at UnterminatedBracket0.cmake:2: bracket with text "\) ". +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) --- Summary of changes: Tests/RunCMake/Syntax/UnterminatedBracket0-stderr.txt |2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1411-g873ec69
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 873ec699047784aa9072e8fb471aa597e573d084 (commit)
via 1c66f23abbcf9c9cef4b72e601893336553bc186 (commit)
via 29332a3ba6593ebc2406ffda9cbf6c9e3d33a875 (commit)
via 2d315d2f59e3bbd4544cc33b718750f1f3a6cea5 (commit)
via c37d2ef32fff9f9d991ef78905ed2097718489c1 (commit)
via 850a4ae4abbb5d5a61862bd26bdc1e9ecdb3a6e6 (commit)
via db7de303c2a1e35b672016833db4bf85148c98c2 (commit)
from 075c74e6b33c65d0c63fc35010c211a4caab (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=873ec699047784aa9072e8fb471aa597e573d084
commit 873ec699047784aa9072e8fb471aa597e573d084
Merge: 075c74e 1c66f23
Author: Stephen Kelly
AuthorDate: Wed Aug 24 15:20:09 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 15:20:09 2016 -0400
Merge topic 'extract-cmMessenger' into next
1c66f23a Parser: Port away from cmMakefile
29332a3b cmMessenger: Extract from cmake class
2d315d2f cmMakefile: Port nested error logic away from cmExecutionStatus
c37d2ef3 cmMakefile: Simplify IssueMessage implementation
850a4ae4 Parser: Issue messages through cmake, not cmSystemTools
db7de303 Parser: Store the Backtrace for use in issuing messages
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c66f23abbcf9c9cef4b72e601893336553bc186
commit 1c66f23abbcf9c9cef4b72e601893336553bc186
Author: Stephen Kelly
AuthorDate: Thu Jan 28 22:10:28 2016 +0100
Commit: Stephen Kelly
CommitDate: Wed Aug 24 20:37:32 2016 +0200
Parser: Port away from cmMakefile
It is an unneeded dependency.
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 9204d14..39d9e97 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -12,7 +12,7 @@
#include "cmListFileCache.h"
#include "cmListFileLexer.h"
-#include "cmMakefile.h"
+#include "cmMessenger.h"
#include "cmOutputConverter.h"
#include "cmSystemTools.h"
#include "cmVersion.h"
@@ -21,7 +21,8 @@
struct cmListFileParser
{
- cmListFileParser(cmListFile* lf, cmMakefile* mf, const char* filename);
+ cmListFileParser(cmListFile* lf, cmListFileBacktrace lfbt,
+ cmMessenger* messenger, const char* filename);
~cmListFileParser();
void IssueFileOpenError(std::string const& text) const;
void IssueError(std::string const& text) const;
@@ -30,8 +31,8 @@ struct cmListFileParser
bool AddArgument(cmListFileLexer_Token* token,
cmListFileArgument::Delimiter delim);
cmListFile* ListFile;
- cmMakefile* Makefile;
cmListFileBacktrace Backtrace;
+ cmMessenger* Messenger;
const char* FileName;
cmListFileLexer* Lexer;
cmListFileFunction Function;
@@ -43,11 +44,12 @@ struct cmListFileParser
} Separation;
};
-cmListFileParser::cmListFileParser(cmListFile* lf, cmMakefile* mf,
+cmListFileParser::cmListFileParser(cmListFile* lf, cmListFileBacktrace lfbt,
+ cmMessenger* messenger,
const char* filename)
: ListFile(lf)
- , Makefile(mf)
- , Backtrace(mf->GetBacktrace())
+ , Backtrace(lfbt)
+ , Messenger(messenger)
, FileName(filename)
, Lexer(cmListFileLexer_New())
{
@@ -60,7 +62,7 @@ cmListFileParser::~cmListFileParser()
void cmListFileParser::IssueFileOpenError(const std::string& text) const
{
- this->Makefile->IssueMessage(cmake::FATAL_ERROR, text);
+ this->Messenger->IssueMessage(cmake::FATAL_ERROR, text, this->Backtrace);
}
void cmListFileParser::IssueError(const std::string& text) const
@@ -70,8 +72,7 @@ void cmListFileParser::IssueError(const std::string& text)
const
lfc.Line = cmListFileLexer_GetCurrentLine(this->Lexer);
cmListFileBacktrace lfbt = this->Backtrace;
lfbt = lfbt.Push(lfc);
- this->Makefile->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, text,
- lfbt);
+ this->Messenger->IssueMessage(cmake::FATAL_ERROR, text, lfbt);
cmSystemTools::SetFatalErrorOccured();
}
@@ -129,7 +130,8 @@ bool cmListFileParser::ParseFile()
return true;
}
-bool cmListFile::ParseFile(const char* filename, cmMakefile* mf)
+bool cmListFile::ParseFile(const char* filename, cmMessenger* messenger,
+ cmListFileBacktrace const& lfbt)
{
if (!cmSystemTools::FileExists(filename) ||
cmSystemTools::FileIsDirectory(filename)) {
@@ -139,7 +141,7 @@ bool cmListFile::ParseFile(const char* filename,
cmMakefile* mf)
bool parseError = false;
{
-cmListFileParser parser(this, mf, filenam
[Cmake-commits] CMake branch, next, updated. v3.6.1-1404-g075c74e
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 075c74e6b33c65d0c63fc35010c211a4caab (commit) via 81c3e637ccc135068a06fa3dc72f23733f003db5 (commit) from 6b3d7f642cab71d8ac0fa7fba01739d86d909ac3 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=075c74e6b33c65d0c63fc35010c211a4caab commit 075c74e6b33c65d0c63fc35010c211a4caab Merge: 6b3d7f6 81c3e63 Author: Brad King AuthorDate: Wed Aug 24 14:24:06 2016 -0400 Commit: Brad King CommitDate: Wed Aug 24 14:24:06 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-716-g81c3e63
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 81c3e637ccc135068a06fa3dc72f23733f003db5 (commit) via dcb2e39fda75ef20b950fe293bbc989e95adbdec (commit) from 86f1d70445f8a192fbc518cac83e0d6e8db70eef (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81c3e637ccc135068a06fa3dc72f23733f003db5 commit 81c3e637ccc135068a06fa3dc72f23733f003db5 Merge: 86f1d70 dcb2e39 Author: Brad King AuthorDate: Wed Aug 24 14:23:56 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 14:23:56 2016 -0400 Merge topic 'update-third-party-git-2.9' dcb2e39f update-third-party: support Git 2.9.0's new merge restrictions --- Summary of changes: Utilities/Scripts/update-third-party.bash |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1402-g6b3d7f6
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 6b3d7f642cab71d8ac0fa7fba01739d86d909ac3 (commit) via dcb2e39fda75ef20b950fe293bbc989e95adbdec (commit) from 15d79ad650d39c88120c897c40dec40ef756948f (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b3d7f642cab71d8ac0fa7fba01739d86d909ac3 commit 6b3d7f642cab71d8ac0fa7fba01739d86d909ac3 Merge: 15d79ad dcb2e39 Author: Brad King AuthorDate: Wed Aug 24 14:23:44 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 14:23:44 2016 -0400 Merge topic 'update-third-party-git-2.9' into next dcb2e39f update-third-party: support Git 2.9.0's new merge restrictions https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcb2e39fda75ef20b950fe293bbc989e95adbdec commit dcb2e39fda75ef20b950fe293bbc989e95adbdec Author: Ben Boeckel AuthorDate: Thu Jun 16 11:21:26 2016 -0400 Commit: Brad King CommitDate: Wed Aug 24 14:16:13 2016 -0400 update-third-party: support Git 2.9.0's new merge restrictions Use the `--allow-unrelated-histories` flag to declare that we Know What We're Doing™ (but only if necessary). diff --git a/Utilities/Scripts/update-third-party.bash b/Utilities/Scripts/update-third-party.bash index 6aeeccd..3b8358e 100644 --- a/Utilities/Scripts/update-third-party.bash +++ b/Utilities/Scripts/update-third-party.bash @@ -155,8 +155,14 @@ popd if [ -n "$basehash" ]; then git merge --log -s recursive "-Xsubtree=$subtree/" --no-commit "upstream-$name" else +unrelated_histories_flag="" +if git merge --help | grep -q -e allow-unrelated-histories; then +unrelated_histories_flag="--allow-unrelated-histories " +fi +readonly unrelated_histories_flag + git fetch "$extractdir" "upstream-$name:upstream-$name" -git merge --log -s ours --no-commit "upstream-$name" +git merge --log -s ours --no-commit $unrelated_histories_flag "upstream-$name" git read-tree -u --prefix="$subtree/" "upstream-$name" fi git commit --no-edit --- Summary of changes: Utilities/Scripts/update-third-party.bash |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.6.1-22-gfc552ce
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, release has been updated via fc552ce1c70e702d26508261090a07ebe1c426a1 (commit) via a2d5c25a7a2b344ba7cf74d44c43bd6054263f59 (commit) from 7da3df3fb617f4fc87d7fbc672e4968120a2ca7b (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 - --- Summary of changes: Modules/GetPrerequisites.cmake |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1400-g15d79ad
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 15d79ad650d39c88120c897c40dec40ef756948f (commit) via 86f1d70445f8a192fbc518cac83e0d6e8db70eef (commit) via fc552ce1c70e702d26508261090a07ebe1c426a1 (commit) from 05a67e9379ad46bae5a2146c1530f33d888590d3 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15d79ad650d39c88120c897c40dec40ef756948f commit 15d79ad650d39c88120c897c40dec40ef756948f Merge: 05a67e9 86f1d70 Author: Brad King AuthorDate: Wed Aug 24 11:59:48 2016 -0400 Commit: Brad King CommitDate: Wed Aug 24 11:59:48 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-714-g86f1d70
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 86f1d70445f8a192fbc518cac83e0d6e8db70eef (commit) via fc552ce1c70e702d26508261090a07ebe1c426a1 (commit) from 96de37092a29cb2e7a92e9cb10b0ef47bca32732 (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1397-g05a67e9
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 05a67e9379ad46bae5a2146c1530f33d888590d3 (commit)
via f699323ade84bb672ed0998de73c6f0333981bc1 (commit)
from dbd83843c85a8d6db2a41f4b12c0ad22162cb18e (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05a67e9379ad46bae5a2146c1530f33d888590d3
commit 05a67e9379ad46bae5a2146c1530f33d888590d3
Merge: dbd8384 f699323
Author: Brad King
AuthorDate: Wed Aug 24 11:59:09 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 11:59:09 2016 -0400
Merge topic 'intel-fortran-mod-diff' into next
f699323a Fortran: Fix .mod file comparison for Intel 16 format
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f699323ade84bb672ed0998de73c6f0333981bc1
commit f699323ade84bb672ed0998de73c6f0333981bc1
Author: Brad King
AuthorDate: Wed Aug 24 11:51:59 2016 -0400
Commit: Brad King
CommitDate: Wed Aug 24 11:55:29 2016 -0400
Fortran: Fix .mod file comparison for Intel 16 format
The Intel 16 format starts with the 0x0A 0x00 sequence that we use to
skip past the timestamp. This occurrence appears to be a version
number. Skip the first byte to avoid matching the sequence early.
Ideally we should gain a better understanding of the format and avoid
depending on short sequences that are likely to appear early by
coincidence, but this approach will suffice for now.
Closes: #16263
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 38e319d..4608b5a 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -677,6 +677,12 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
const char seq[2] = { '\n', '\0' };
const int seqlen = 2;
+// Skip the leading byte which appears to be a version number.
+// We do not need to check for an error because the sequence search
+// below will fail in that case.
+finModFile.get();
+finStampFile.get();
+
if (!cmFortranStreamContainsSequence(finModFile, seq, seqlen)) {
// The module is of unexpected format. Assume it is different.
std::cerr << compilerId << " fortran module " << modFile
---
Summary of changes:
Source/cmDependsFortran.cxx |6 ++
1 file changed, 6 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1395-gdbd8384
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 dbd83843c85a8d6db2a41f4b12c0ad22162cb18e (commit)
via 828e763260c257920d91037395c7f88e59243367 (commit)
from 89a08c97932ddd3f5083996a8fcc530ea88077aa (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbd83843c85a8d6db2a41f4b12c0ad22162cb18e
commit dbd83843c85a8d6db2a41f4b12c0ad22162cb18e
Merge: 89a08c9 828e763
Author: Brad King
AuthorDate: Wed Aug 24 10:59:09 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 10:59:09 2016 -0400
Merge topic 'test-RunCMake.CMP0040-fix' into next
828e7632 Tests: Fix RunCMake.CMP0040 custom command syntax
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=828e763260c257920d91037395c7f88e59243367
commit 828e763260c257920d91037395c7f88e59243367
Author: Brad King
AuthorDate: Wed Aug 24 10:56:53 2016 -0400
Commit: Brad King
CommitDate: Wed Aug 24 10:56:57 2016 -0400
Tests: Fix RunCMake.CMP0040 custom command syntax
diff --git a/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target.cmake
b/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target.cmake
index f9c8afd..880b178 100644
--- a/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target.cmake
+++ b/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target.cmake
@@ -3,5 +3,5 @@ cmake_policy(SET CMP0040 NEW)
add_library(foobar empty.cpp)
add_custom_command(TARGET foobar PRE_BUILD
- COMMAND "${CMAKE_COMMAND} -E echo hello world"
+ COMMAND ${CMAKE_COMMAND} -E echo hello world
)
diff --git a/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target.cmake
b/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target.cmake
index 276863d..a9f764c 100644
--- a/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target.cmake
+++ b/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target.cmake
@@ -1,5 +1,5 @@
cmake_policy(SET CMP0040 NEW)
add_custom_command(TARGET foobar PRE_BUILD
- COMMAND "${CMAKE_COMMAND} -E hello world"
+ COMMAND ${CMAKE_COMMAND} -E hello world
)
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target.cmake
b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target.cmake
index d7ec50d..7a9e91e 100644
--- a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target.cmake
+++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target.cmake
@@ -3,5 +3,5 @@ cmake_policy(SET CMP0040 OLD)
add_library(foobar empty.cpp)
add_custom_command(TARGET foobar PRE_BUILD
- COMMAND "${CMAKE_COMMAND} -E echo hello world"
+ COMMAND ${CMAKE_COMMAND} -E echo hello world
)
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target.cmake
b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target.cmake
index ef7a0f7..0f5cd15 100644
--- a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target.cmake
+++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target.cmake
@@ -1,5 +1,5 @@
cmake_policy(SET CMP0040 OLD)
add_custom_command(TARGET foobar PRE_BUILD
- COMMAND "${CMAKE_COMMAND} -E echo hello world"
+ COMMAND ${CMAKE_COMMAND} -E echo hello world
)
diff --git a/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target.cmake
b/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target.cmake
index 2c3e401..4efeaae 100644
--- a/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target.cmake
+++ b/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target.cmake
@@ -1,4 +1,4 @@
add_custom_command(TARGET foobar PRE_BUILD
- COMMAND "${CMAKE_COMMAND} -E hello world"
+ COMMAND ${CMAKE_COMMAND} -E hello world
)
---
Summary of changes:
Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target.cmake |2 +-
Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target.cmake |2 +-
Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target.cmake |2 +-
Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target.cmake |2 +-
Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target.cmake |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1393-g89a08c9
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 89a08c97932ddd3f5083996a8fcc530ea88077aa (commit)
via 7bc6dccc0a993ddb3681100e28405189be09ff72 (commit)
via fcc532470aa56e7a2e345f7f2396774787feb2ce (commit)
from e4ad8dc8cb379cd5875f079c6dea21fa89c79611 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89a08c97932ddd3f5083996a8fcc530ea88077aa
commit 89a08c97932ddd3f5083996a8fcc530ea88077aa
Merge: e4ad8dc 7bc6dcc
Author: Brad King
AuthorDate: Wed Aug 24 10:55:38 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 10:55:38 2016 -0400
Merge topic 'update-kwsys' into next
7bc6dccc Merge branch 'upstream-KWSys' into update-kwsys
fcc53247 KWSys 2016-08-24 (8e643b9b)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bc6dccc0a993ddb3681100e28405189be09ff72
commit 7bc6dccc0a993ddb3681100e28405189be09ff72
Merge: 96de370 fcc5324
Author: Brad King
AuthorDate: Wed Aug 24 10:55:19 2016 -0400
Commit: Brad King
CommitDate: Wed Aug 24 10:55:19 2016 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-08-24 (8e643b9b)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcc532470aa56e7a2e345f7f2396774787feb2ce
commit fcc532470aa56e7a2e345f7f2396774787feb2ce
Author: KWSys Upstream
AuthorDate: Wed Aug 24 10:53:55 2016 -0400
Commit: Brad King
CommitDate: Wed Aug 24 10:55:18 2016 -0400
KWSys 2016-08-24 (8e643b9b)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 8e643b9b5f24d4cac68d59b1e2be9d161fb75974 (master).
Upstream Shortlog
-
Brad King (1):
8e643b9b SystemTools: Fix crash in GetShortPath
diff --git a/SystemTools.cxx b/SystemTools.cxx
index eb2bec6..1a73b16 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4725,8 +4725,11 @@ bool SystemTools::GetShortPath(const std::string& path,
std::string& shortPath)
std::wstring wtempPath = Encoding::ToWide(tempPath);
DWORD ret = GetShortPathNameW(wtempPath.c_str(), NULL, 0);
std::vector buffer(ret);
- ret = GetShortPathNameW(wtempPath.c_str(),
- &buffer[0], static_cast(buffer.size()));
+ if (ret != 0)
+{
+ret = GetShortPathNameW(wtempPath.c_str(),
+&buffer[0], static_cast(buffer.size()));
+}
if (ret == 0)
{
---
Summary of changes:
Source/kwsys/SystemTools.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1390-ge4ad8dc
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 e4ad8dc8cb379cd5875f079c6dea21fa89c79611 (commit) via 96de37092a29cb2e7a92e9cb10b0ef47bca32732 (commit) via ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb (commit) via 4a2a66e31c4b7fbcc6bbe41219a6c7f0624dc165 (commit) via 21a7809bfaa02ec3d11620676636e65b47065b62 (commit) via 5c8b69b0f5408bb59a92ff3f061bd76efa773eff (commit) via 1d858dc017560b99206b542c42b2a7adaa344cb8 (commit) via 2986ca5ecc0120790c7fc8801647078f3475be18 (commit) via a71ca1f0b3a405e6ff1ea4b09badcc345581ddba (commit) from bbc5b5cbd9beeb0091fd8b07de4d4b2ef0b48f91 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4ad8dc8cb379cd5875f079c6dea21fa89c79611 commit e4ad8dc8cb379cd5875f079c6dea21fa89c79611 Merge: bbc5b5c 96de370 Author: Brad King AuthorDate: Wed Aug 24 09:46:03 2016 -0400 Commit: Brad King CommitDate: Wed Aug 24 09:46:03 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-712-g96de370
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 96de37092a29cb2e7a92e9cb10b0ef47bca32732 (commit) via 7b637ebdc97655462d08d8ff70bee5d4f32e4681 (commit) via c2f561e58c799cc82df7db70710ae2f79b8b6b64 (commit) via 6b84df8da98169af43d4173dfbd1dedf5979dcb2 (commit) via d7d4083025f3007b862dd500c8f5fc64e105055b (commit) via b22294bc41c3ce62e561c7123c3f489a750dcb66 (commit) via b6a3102a9f8da05b50d4f4e96dd9f42ace37aa9b (commit) via d1e3cec2aa17a2f07f22c64c3bd29c765d69d9d2 (commit) via 504db72d99fc2302de605fd9c2f845c1b8865500 (commit) via fa6325782112063b5d425714a37c8ebd01b90d7c (commit) via 6299693f8aa5f5a61cec82215b73a2040a8d8603 (commit) via 29b51379de352980dd453243bea7ed37ed300c62 (commit) via 7d9b49fbdf55b28d2979af89a8192607df487ca1 (commit) via 4389664a26be4d1f96a55c34e5fac9ac1248e5f0 (commit) via 328191f65f7fb58ece6f749fbfc3462539c7afc1 (commit) via 9e032304ea4133dd6c59b2c0f3b686d4a7aac2a5 (commit) via fde59c4d882e104459dbdf8a07a22899427b6657 (commit) via 52b6effd817ae44577f86df4f382b0c98df7402a (commit) via 8e0cb45e5591cc778b054780f9e6290c3f239815 (commit) via d5e7d5f3ebb42e1a8b38e4bd30f717cdac81ed77 (commit) via 64be1ae4a3ae98e63cf35d495f0ca06c77cdf923 (commit) via 47866770cee381851ccc8070f64459909a838288 (commit) via 735f168bf08a4fdf1d9e245035d2dbcadbed652f (commit) via c148803a575ed1c3639123190b1d6a5d31578f34 (commit) from ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96de37092a29cb2e7a92e9cb10b0ef47bca32732 commit 96de37092a29cb2e7a92e9cb10b0ef47bca32732 Merge: ccddb45 7b637eb Author: Brad King AuthorDate: Wed Aug 24 09:45:50 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 09:45:50 2016 -0400 Merge topic 'android-platform-modules' 7b637ebd Android: Add `ANDROID` variable to indicate the target c2f561e5 Android: Add test cases covering use of the NDK and standalone toolchains 6b84df8d Help: Document cross compiling for Android d7d40830 Android: Select the STL type for NDK builds b22294bc Android: Populate compiler flags for current ABI b6a3102a Android: Add a CMAKE_BUILD_TYPE default d1e3cec2 Android: Add Clang -target option for current ABI 504db72d Android: Add placeholders for compiler/abi-specific settings fa632578 Android: Avoid interfering with common pre-existing toolchain files 6299693f Android: Search for NDK and standalone toolchain in more places 29b51379 Android: Detect and save a standalone toolchain without the NDK 7d9b49fb Android: Detect settings from the CMAKE_SYSROOT if it is set 4389664a Android: Detect and save a toolchain from the NDK 328191f6 Android: Set CMAKE_SYSROOT automatically 9e032304 Android: Detect and save the architecture, ABI, and processor fde59c4d Android: Detect and save the API level ... --- Summary of changes: Help/manual/cmake-toolchains.7.rst | 204 - Help/manual/cmake-variables.7.rst |9 + Help/prop_tgt/ANDROID_API.rst |9 +- Help/prop_tgt/ANDROID_ARCH.rst |3 +- Help/prop_tgt/ANDROID_GUI.rst |4 +- Help/prop_tgt/ANDROID_STL_TYPE.rst | 32 ++- Help/release/dev/android-platform-modules.rst |5 + Help/variable/ANDROID.rst |5 + Help/variable/CMAKE_ANDROID_API.rst| 10 +- Help/variable/CMAKE_ANDROID_ARCH.rst | 18 +- Help/variable/CMAKE_ANDROID_ARCH_ABI.rst | 17 ++ Help/variable/CMAKE_ANDROID_ARM_MODE.rst |7 + Help/variable/CMAKE_ANDROID_ARM_NEON.rst |6 + Help/variable/CMAKE_ANDROID_NDK.rst|7 + .../CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst| 13 + .../CMAKE_ANDROID_STANDALONE_TOOLCHAIN.rst |6 + Help/variable/CMAKE_ANDROID_STL_TYPE.rst | 35 ++- .../CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX.rst| 11 + .../CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX.rst|7 + Modules/CMakeCCompiler.cmake.in|1 + Modules/CMakeCXXCompiler.cmake.in |1 + Modules/CMakeDetermineSystem.cmake |1 + Modules/CMakeFortranCompiler.cmake.in |2 + Modules/CMakeSystem.cmake.in |2 +-
[Cmake-commits] CMake branch, master, updated. v3.6.1-688-gccddb45
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 ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb (commit)
via 828d6c137d703ea095008fc6da794904a15c4ebd (commit)
via ff5c89de0c23c0568afcbabd63974388ca045aa3 (commit)
from 4a2a66e31c4b7fbcc6bbe41219a6c7f0624dc165 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb
commit ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb
Merge: 4a2a66e 828d6c1
Author: Brad King
AuthorDate: Wed Aug 24 09:45:47 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 09:45:47 2016 -0400
Merge topic 'extend-find-package-search-path'
828d6c13 find_package: Extend search path for combined Windows/UNIX
convention
ff5c89de Help: Widen find_package search path table
---
Summary of changes:
Help/command/find_package.rst | 17 +
Source/cmFindPackageCommand.cxx| 38
.../lib/cmake/Baz}/BazConfig.cmake |0
.../lib/cmake/Baz/BazConfigVersion.cmake} |4 +--
.../share/Baz 2}/BazConfig.cmake |0
.../share/Baz 2/BazConfigVersion.cmake}|4 +--
.../lib/Baz 2/cmake}/BazConfig.cmake |0
.../lib/Baz 2/cmake/BazConfigVersion.cmake}|4 +--
Tests/FindPackageTest/CMakeLists.txt | 12 +--
9 files changed, 64 insertions(+), 15 deletions(-)
copy Tests/FindPackageTest/{Baz 1.1 => Baz 1.3/lib/cmake/Baz}/BazConfig.cmake
(100%)
copy Tests/FindPackageTest/{lib/suffix/test/SuffixTestConfigVersion.cmake =>
Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake} (64%)
copy Tests/FindPackageTest/{Baz 1.1 => Baz 2.0/share/Baz 2}/BazConfig.cmake
(100%)
copy Tests/FindPackageTest/{lib/arch/cmake/zot-4.0/zot-config-version.cmake =>
Baz 2.0/share/Baz 2/BazConfigVersion.cmake} (65%)
copy Tests/FindPackageTest/{Baz 1.1 => Baz 2.1/lib/Baz
2/cmake}/BazConfig.cmake (100%)
copy Tests/FindPackageTest/{lib/arch/zot-3.1/zot-config-version.cmake => Baz
2.1/lib/Baz 2/cmake/BazConfigVersion.cmake} (65%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-681-g5c8b69b
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 5c8b69b0f5408bb59a92ff3f061bd76efa773eff (commit) via 2dc9a754b539bb215ad2360a27327a629ad26627 (commit) from 1d858dc017560b99206b542c42b2a7adaa344cb8 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c8b69b0f5408bb59a92ff3f061bd76efa773eff commit 5c8b69b0f5408bb59a92ff3f061bd76efa773eff Merge: 1d858dc 2dc9a75 Author: Brad King AuthorDate: Wed Aug 24 09:45:39 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 09:45:39 2016 -0400 Merge topic 'FindCUDA-fix-arch-regex' 2dc9a754 FindCUDA: Support `2.1(2.0)` architecture notation --- Summary of changes: Modules/FindCUDA/select_compute_arch.cmake |8 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-685-g4a2a66e
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 4a2a66e31c4b7fbcc6bbe41219a6c7f0624dc165 (commit) via 5cbb54880742c23658991edec91a514f3582ed2b (commit) from 21a7809bfaa02ec3d11620676636e65b47065b62 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a2a66e31c4b7fbcc6bbe41219a6c7f0624dc165 commit 4a2a66e31c4b7fbcc6bbe41219a6c7f0624dc165 Merge: 21a7809 5cbb548 Author: Brad King AuthorDate: Wed Aug 24 09:45:44 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 09:45:44 2016 -0400 Merge topic 'include-what-you-use' 5cbb5488 fix a batch of include-what-you-use violations --- Summary of changes: Source/CTest/cmCTestCVS.h |3 +++ Source/CTest/cmCTestGlobalVC.h |2 ++ Source/cmBreakCommand.cxx |2 ++ Source/cmMakefile.cxx | 26 Source/cmMakefile.h| 30 ++-- Source/cmMakefileExecutableTargetGenerator.cxx | 10 +++- Source/cmMakefileExecutableTargetGenerator.h |4 Source/cmMakefileLibraryTargetGenerator.cxx| 11 +++-- Source/cmMakefileLibraryTargetGenerator.h |6 + Source/cmMakefileTargetGenerator.cxx | 17 ++ Source/cmMakefileTargetGenerator.h | 14 +++ Source/cmMakefileUtilityTargetGenerator.cxx|8 ++- Source/cmMakefileUtilityTargetGenerator.h |4 Source/cmNewLineStyle.cxx |2 ++ Source/cmNewLineStyle.h|5 +++- Source/cmNinjaNormalTargetGenerator.cxx| 12 ++ Source/cmNinjaNormalTargetGenerator.h |9 --- Source/cmNinjaTargetGenerator.cxx |8 +++ Source/cmNinjaTargetGenerator.h| 12 ++ Source/cmNinjaUtilityTargetGenerator.cxx | 12 ++ Source/cmNinjaUtilityTargetGenerator.h |6 ++--- Source/cmPolicies.cxx | 12 ++ Source/cmPolicies.h|4 ++-- Source/cmProcessTools.cxx |1 + Source/cmProcessTools.h|6 - Source/cmProperty.cxx |2 +- Source/cmProperty.h|4 +++- Source/cmPropertyDefinition.cxx|2 -- Source/cmPropertyDefinition.h |4 Source/cmPropertyDefinitionMap.cxx |3 +-- Source/cmPropertyDefinitionMap.h |6 - Source/cmPropertyMap.cxx |6 ++--- Source/cmPropertyMap.h |6 + 33 files changed, 192 insertions(+), 67 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-677-g2986ca5
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 2986ca5ecc0120790c7fc8801647078f3475be18 (commit) via aec06dd4922187ce5346d20a9f0d53f01b6ce9fc (commit) via ef13efab56464890f171c2a2142b64b728f4f2e8 (commit) from a71ca1f0b3a405e6ff1ea4b09badcc345581ddba (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2986ca5ecc0120790c7fc8801647078f3475be18 commit 2986ca5ecc0120790c7fc8801647078f3475be18 Merge: a71ca1f aec06dd Author: Brad King AuthorDate: Wed Aug 24 09:45:33 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 09:45:33 2016 -0400 Merge topic 'version-cleanups' aec06dd4 Version: Always define CMake_VERSION_IS_DIRTY to 0 or 1 ef13efab Version: Remove check for existence of CVS repository --- Summary of changes: Source/CMakeVersionCompute.cmake |1 + Source/CMakeVersionSource.cmake |9 - 2 files changed, 1 insertion(+), 9 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-679-g1d858dc
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 1d858dc017560b99206b542c42b2a7adaa344cb8 (commit) via 9bd0643a771b19131d14613e963d61d4b32106ee (commit) from 2986ca5ecc0120790c7fc8801647078f3475be18 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d858dc017560b99206b542c42b2a7adaa344cb8 commit 1d858dc017560b99206b542c42b2a7adaa344cb8 Merge: 2986ca5 9bd0643 Author: Brad King AuthorDate: Wed Aug 24 09:45:36 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 09:45:36 2016 -0400 Merge topic 'test-extra-generator-dedup' 9bd0643a Tests: Refactor testing of extra generators. --- Summary of changes: Tests/CMakeLists.txt | 77 -- 1 file changed, 30 insertions(+), 47 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-683-g21a7809
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 21a7809bfaa02ec3d11620676636e65b47065b62 (commit) via 15cc50fbb505b526e28c708e4e1b16e79a66799c (commit) from 5c8b69b0f5408bb59a92ff3f061bd76efa773eff (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21a7809bfaa02ec3d11620676636e65b47065b62 commit 21a7809bfaa02ec3d11620676636e65b47065b62 Merge: 5c8b69b 15cc50f Author: Brad King AuthorDate: Wed Aug 24 09:45:41 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 09:45:41 2016 -0400 Merge topic 'doc-get_cmake_property' 15cc50fb Help: Clarify get_cmake_property command documentation --- Summary of changes: Help/command/get_cmake_property.rst | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-674-ga71ca1f
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 a71ca1f0b3a405e6ff1ea4b09badcc345581ddba (commit)
via b4556b47a82f09d2dc40118e1e6cb41b69ece529 (commit)
via 25c01cf0b0b940bbfb2d27410efdb4091479bcda (commit)
via e3ac68cfbf04e48a089b6d3cb4f4091e559dc5a0 (commit)
via 4a22c06e7fe8bcfb3c7243c5b8d98cc34df13f06 (commit)
via f21a823598c672efd73de09b826acaeba231946c (commit)
via 0966f1c5489591ba049b43f9e56a9f4e34778789 (commit)
from 00a583ac6833bdb2909d1bab1bffb28fb6c2b245 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a71ca1f0b3a405e6ff1ea4b09badcc345581ddba
commit a71ca1f0b3a405e6ff1ea4b09badcc345581ddba
Merge: 00a583a b4556b4
Author: Brad King
AuthorDate: Wed Aug 24 09:45:29 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 09:45:29 2016 -0400
Merge topic 'import-vim-syntax'
b4556b47 Help: Add release notes for 'vim-cmake-syntax' import
25c01cf0 Aux: Install vim-cmake-syntax files with CMake
e3ac68cf Merge branch 'upstream-vim-cmake-syntax' into import-vim-syntax
4a22c06e vim-cmake-syntax 2016-08-16 (e782679c)
f21a8235 Aux: Drop vim files prior to import of third-party version
0966f1c5 Add script to update vim-cmake-syntax from upstream
---
Summary of changes:
Auxiliary/CMakeLists.txt |2 +-
Auxiliary/cmake-help.vim | 21 ---
Auxiliary/vim/cmake.vim.in | 91 +
Auxiliary/vim/extract-upper-case.pl| 141
.../{cmake-indent.vim => vim/indent/cmake.vim} | 10 --
.../{cmake-syntax.vim => vim/syntax/cmake.vim} | 11 +-
Help/release/dev/vim-cmake-syntax.rst | 11 ++
Utilities/Scripts/update-vim-syntax.bash | 24
8 files changed, 271 insertions(+), 40 deletions(-)
delete mode 100644 Auxiliary/cmake-help.vim
create mode 100644 Auxiliary/vim/cmake.vim.in
create mode 100755 Auxiliary/vim/extract-upper-case.pl
rename Auxiliary/{cmake-indent.vim => vim/indent/cmake.vim} (88%)
rename Auxiliary/{cmake-syntax.vim => vim/syntax/cmake.vim} (83%)
create mode 100644 Help/release/dev/vim-cmake-syntax.rst
create mode 100755 Utilities/Scripts/update-vim-syntax.bash
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1381-gbbc5b5c
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 bbc5b5cbd9beeb0091fd8b07de4d4b2ef0b48f91 (commit)
via 828d6c137d703ea095008fc6da794904a15c4ebd (commit)
from ab1846f43b8eff95eba073a9df2414f24601d7a5 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbc5b5cbd9beeb0091fd8b07de4d4b2ef0b48f91
commit bbc5b5cbd9beeb0091fd8b07de4d4b2ef0b48f91
Merge: ab1846f 828d6c1
Author: Brad King
AuthorDate: Wed Aug 24 09:40:43 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 09:40:43 2016 -0400
Merge topic 'extend-find-package-search-path' into next
828d6c13 find_package: Extend search path for combined Windows/UNIX
convention
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=828d6c137d703ea095008fc6da794904a15c4ebd
commit 828d6c137d703ea095008fc6da794904a15c4ebd
Author: Silvio Traversaro
AuthorDate: Sat Aug 20 12:06:55 2016 +0200
Commit: Brad King
CommitDate: Wed Aug 24 09:40:25 2016 -0400
find_package: Extend search path for combined Windows/UNIX convention
Find packages that install their cmake package configuration files in
`lib/cmake/` when they are installed in the default Windows
CMAKE_INSTALL_PREFIX, `C:/Program Files/`.
Closes: #16212
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst
index 8098a87..c44fe86 100644
--- a/Help/command/find_package.rst
+++ b/Help/command/find_package.rst
@@ -201,6 +201,9 @@ Each entry is meant for installation trees following
Windows (W), UNIX
/(lib/|lib|share)/cmake/*/ (U)
/(lib/|lib|share)/*/(U)
/(lib/|lib|share)/*/(cmake|CMake)/ (U)
+ /*/(lib/|lib|share)/cmake/*/ (W/U)
+ /*/(lib/|lib|share)/*/(W/U)
+ /*/(lib/|lib|share)/*/(cmake|CMake)/ (W/U)
On systems supporting OS X Frameworks and Application Bundles the
following directories are searched for frameworks or bundles
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 260079b..8338c2a 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1961,6 +1961,44 @@ bool cmFindPackageCommand::SearchPrefix(std::string
const& prefix_in)
}
}
+ // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/cmake/(Foo|foo|FOO).*/
+ {
+cmFindPackageFileList lister(this);
+lister / cmFileListGeneratorFixed(prefix) /
+ cmFileListGeneratorProject(this->Names) /
+ cmFileListGeneratorEnumerate(common) /
+ cmFileListGeneratorFixed("cmake") /
+ cmFileListGeneratorProject(this->Names);
+if (lister.Search()) {
+ return true;
+}
+ }
+
+ // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/(Foo|foo|FOO).*/
+ {
+cmFindPackageFileList lister(this);
+lister / cmFileListGeneratorFixed(prefix) /
+ cmFileListGeneratorProject(this->Names) /
+ cmFileListGeneratorEnumerate(common) /
+ cmFileListGeneratorProject(this->Names);
+if (lister.Search()) {
+ return true;
+}
+ }
+
+ // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/(Foo|foo|FOO).*/(cmake|CMake)/
+ {
+cmFindPackageFileList lister(this);
+lister / cmFileListGeneratorFixed(prefix) /
+ cmFileListGeneratorProject(this->Names) /
+ cmFileListGeneratorEnumerate(common) /
+ cmFileListGeneratorProject(this->Names) /
+ cmFileListGeneratorCaseInsensitive("cmake");
+if (lister.Search()) {
+ return true;
+}
+ }
+
return false;
}
diff --git a/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake
b/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake
new file mode 100644
index 000..deffa57
--- /dev/null
+++ b/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake
@@ -0,0 +1 @@
+# Test config file.
diff --git a/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake
b/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake
new file mode 100644
index 000..d8cac77
--- /dev/null
+++ b/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake
@@ -0,0 +1,7 @@
+set(PACKAGE_VERSION 1.3)
+if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1)
+ set(PACKAGE_VERSION_COMPATIBLE 1)
+ if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 3)
+set(PACKAGE_VERSION_EXACT 1)
+ endif()
+endif()
diff --git a/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfig.cmake
b/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfig.cmake
new file mode 100644
index 000..deffa57
--- /dev/null
+++ b/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfig.cmake
@@ -0,0 +1 @@
+# Test config file.
diff --git a/Tests/FindP
[Cmake-commits] CMake branch, next, updated. v3.6.1-1379-gab1846f
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 ab1846f43b8eff95eba073a9df2414f24601d7a5 (commit)
via d8fbb7d2d33ddbfa69f13e86c9da293591bf8d5f (commit)
via 00a583ac6833bdb2909d1bab1bffb28fb6c2b245 (commit)
from 43edf727670912226bfbb7d9b4579e28013b42be (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab1846f43b8eff95eba073a9df2414f24601d7a5
commit ab1846f43b8eff95eba073a9df2414f24601d7a5
Merge: 43edf72 d8fbb7d
Author: Brad King
AuthorDate: Wed Aug 24 09:32:35 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 09:32:35 2016 -0400
Merge topic 'vs-resource-pri-dir' into next
d8fbb7d2 VS: Use target-specific intermediate directory for `resources.pri`
00a583ac CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8fbb7d2d33ddbfa69f13e86c9da293591bf8d5f
commit d8fbb7d2d33ddbfa69f13e86c9da293591bf8d5f
Author: Vitalyi Khoruzhyi
AuthorDate: Fri May 20 14:18:02 2016 +0300
Commit: Brad King
CommitDate: Wed Aug 24 09:02:49 2016 -0400
VS: Use target-specific intermediate directory for `resources.pri`
Set the `ProjectPriFullPath` field to a value that is unique to each
target and not shared with others in order to avoid collisions.
Closes: #16106
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index c33a291..ffad095 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2742,7 +2742,7 @@ void
cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
(*this->BuildFileStream) << cmVS10EscapeXML(artifactDir)
<< "\\\n";
this->WriteString(""
-"$(TargetDir)resources.pri\n",
+"$(IntDir)resources.pri\n",
2);
// If we are missing files and we don't have a certificate and
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmVisualStudio10TargetGenerator.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
