[Cmake-commits] CMake branch, master, updated. v2.8.11.1-302-g3aaf043
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 3aaf04365c014a7a71ce5edbdb2d739349f120d1 (commit) from 82771f186220b45a9aaf10ed416f1df135e56c36 (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=3aaf04365c014a7a71ce5edbdb2d739349f120d1 commit 3aaf04365c014a7a71ce5edbdb2d739349f120d1 Author: Kitware Robot AuthorDate: Fri Jun 14 00:01:04 2013 -0400 Commit: Kitware Robot CommitDate: Fri Jun 14 00:01:04 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b2cf9ed..91b2202 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 11) -set(CMake_VERSION_TWEAK 20130613) +set(CMake_VERSION_TWEAK 20130614) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2616-g349ce84
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 349ce8462282c2036b427aa3d790ff97955c861f (commit)
via 75994d953e261b388aa31e4d8ecd8af9fe53142b (commit)
from a0ba36288a4ed0b0e3ebeb339bc8303d778b4225 (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=349ce8462282c2036b427aa3d790ff97955c861f
commit 349ce8462282c2036b427aa3d790ff97955c861f
Merge: a0ba362 75994d9
Author: Brad King
AuthorDate: Thu Jun 13 08:46:12 2013 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 13 08:46:12 2013 -0400
Merge topic 'sha2-alignment' into next
75994d9 cmCryptoHash: Increase alignment of HashFile buffer
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75994d953e261b388aa31e4d8ecd8af9fe53142b
commit 75994d953e261b388aa31e4d8ecd8af9fe53142b
Author: Brad King
AuthorDate: Mon Jun 10 16:52:16 2013 -0400
Commit: Brad King
CommitDate: Thu Jun 13 08:40:10 2013 -0400
cmCryptoHash: Increase alignment of HashFile buffer
The SHA512_Update implementation accesses input data via 64-bit
integers. This requires alignment of the input buffer on some
architectures. Align our stack-allocated buffer for file content to
satisfy this requirement.
diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx
index a1505bd..a4f6ac4 100644
--- a/Source/cmCryptoHash.cxx
+++ b/Source/cmCryptoHash.cxx
@@ -54,8 +54,8 @@ std::string cmCryptoHash::HashFile(const char* file)
this->Initialize();
// Should be efficient enough on most system:
- const int bufferSize = 4096;
- char buffer[bufferSize];
+ cm_sha2_uint64_t buffer[512];
+ char* buffer_c = reinterpret_cast(buffer);
unsigned char const* buffer_uc =
reinterpret_cast(buffer);
// This copy loop is very sensitive on certain platforms with
@@ -65,7 +65,7 @@ std::string cmCryptoHash::HashFile(const char* file)
// error occurred. Therefore, the loop should be safe everywhere.
while(fin)
{
-fin.read(buffer, bufferSize);
+fin.read(buffer_c, sizeof(buffer));
if(int gcount = static_cast(fin.gcount()))
{
this->Append(buffer_uc, gcount);
---
Summary of changes:
Source/cmCryptoHash.cxx |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, next, updated. v2.8.11.1-2614-ga0ba362
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 a0ba36288a4ed0b0e3ebeb339bc8303d778b4225 (commit)
via b3b57e7a31446bf7b0e47c7508d34f34cb322a6a (commit)
from f9402d8b1596493374372ebf04a6c07620ae277f (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=a0ba36288a4ed0b0e3ebeb339bc8303d778b4225
commit a0ba36288a4ed0b0e3ebeb339bc8303d778b4225
Merge: f9402d8 b3b57e7
Author: Brad King
AuthorDate: Thu Jun 13 08:39:29 2013 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 13 08:39:29 2013 -0400
Merge topic 'doc-enable_language-scope' into next
b3b57e7 enable_language: Clarify documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3b57e7a31446bf7b0e47c7508d34f34cb322a6a
commit b3b57e7a31446bf7b0e47c7508d34f34cb322a6a
Author: Brad King
AuthorDate: Wed Jun 12 10:25:43 2013 -0400
Commit: Brad King
CommitDate: Wed Jun 12 10:58:32 2013 -0400
enable_language: Clarify documentation
Describe explicitly the scope in which enable_language must be
invoked to handle all direct and indirect uses of a language.
While at it, re-word documentation of the OPTIONAL keyword to
avoid confusion over its partial implementation.
diff --git a/Source/cmEnableLanguageCommand.h b/Source/cmEnableLanguageCommand.h
index ee963f9..747448b 100644
--- a/Source/cmEnableLanguageCommand.h
+++ b/Source/cmEnableLanguageCommand.h
@@ -59,18 +59,21 @@ public:
virtual const char* GetFullDocumentation() const
{
return
- " enable_language(languageName [OPTIONAL] )\n"
+ " enable_language( [OPTIONAL] )\n"
"This command enables support for the named language in CMake. "
"This is the same as the project command but does not create "
"any of the extra variables that are created by the project command. "
"Example languages are CXX, C, Fortran. "
- "If OPTIONAL is used, use the CMAKE__COMPILER_WORKS "
- "variable to check whether the language has been enabled successfully."
"\n"
- "This command must be called on file scope (not inside a function) and "
- "the language enabled can only be used in the calling project or its "
- "subdirectories added by add_subdirectory(). Also note that at present, "
- "the OPTIONAL argument does not work.";
+ "This command must be called in file scope, not in a function call. "
+ "Furthermore, it must be called in the highest directory common to "
+ "all targets using the named language directly for compiling sources "
+ "or indirectly through link dependencies. "
+ "It is simplest to enable all needed languages in the top-level "
+ "directory of a project."
+ "\n"
+ "The OPTIONAL keyword is a placeholder for future implementation "
+ "and does not currently work.";
}
cmTypeMacro(cmEnableLanguageCommand, cmCommand);
---
Summary of changes:
Source/cmEnableLanguageCommand.h | 17 ++---
1 files changed, 10 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
