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 1c2a6406a4311c59afeb3993982e74c7c8e38bdd (commit)
via 137ba24f5d2fafefe812b592df2a96a5720c8304 (commit)
from cf9453139841a31e07f5d5bbda87a08dc05e1a59 (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=1c2a6406a4311c59afeb3993982e74c7c8e38bdd
commit 1c2a6406a4311c59afeb3993982e74c7c8e38bdd
Merge: cf94531 137ba24
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Fri Nov 13 14:49:41 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Nov 13 14:49:41 2015 -0500
Merge topic 'add-cray-linux-platform' into next
137ba24f Cray: Fix typo
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=137ba24f5d2fafefe812b592df2a96a5720c8304
commit 137ba24f5d2fafefe812b592df2a96a5720c8304
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Fri Nov 13 14:49:17 2015 -0500
Commit: Chuck Atkins <chuck.atk...@kitware.com>
CommitDate: Fri Nov 13 14:49:17 2015 -0500
Cray: Fix typo
diff --git a/Modules/Platform/CrayPrgEnv.cmake
b/Modules/Platform/CrayPrgEnv.cmake
index 53c6490..a78846d 100644
--- a/Modules/Platform/CrayPrgEnv.cmake
+++ b/Modules/Platform/CrayPrgEnv.cmake
@@ -14,7 +14,7 @@ else()
endif()
if(NOT __CrayLinuxEnvironment)
- message(FATAL_ERROR "The CrayPrgEnv tolchain file must not be used on its
own and is intented to be included by the CrayLinuxEnvironment platform file")
+ message(FATAL_ERROR "The CrayPrgEnv platform file must not be used on its
own and is intented to be included by the CrayLinuxEnvironment platform file")
endif()
# Flags for the Cray wrappers
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/CrayPrgEnv.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
