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 ab3cf9d3f175c83caaa7802635d58efe275899d8 (commit)
via 35462070aad71d474cc99ff40c360fb5a447e161 (commit)
from 6f8a70baec31a6ab9569c41a7ff992d6014cc2ef (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=ab3cf9d3f175c83caaa7802635d58efe275899d8
commit ab3cf9d3f175c83caaa7802635d58efe275899d8
Merge: 6f8a70b 3546207
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Apr 23 08:17:48 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Apr 23 08:17:48 2014 -0400
Merge topic 'WriteCompilerDetectionHeader-module' into next
35462070 Fix tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35462070aad71d474cc99ff40c360fb5a447e161
commit 35462070aad71d474cc99ff40c360fb5a447e161
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Apr 23 14:17:32 2014 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Apr 23 14:17:32 2014 +0200
Fix tests.
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/ExtraArgs-stderr.txt
b/Tests/RunCMake/WriteCompilerDetectionHeader/ExtraArgs-stderr.txt
index 917cf15..62c4ff1 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/ExtraArgs-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/ExtraArgs-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:184 \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
Unparsed arguments: GarbageArg
Call Stack \(most recent call first\):
ExtraArgs.cmake:4 \(write_compiler_detection_header\)
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/FileTypo-stderr.txt
b/Tests/RunCMake/WriteCompilerDetectionHeader/FileTypo-stderr.txt
index 3d13a25..eb94426 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/FileTypo-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/FileTypo-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:166 \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:164 \(message\):
write_compiler_detection_header: FILE parameter missing.
Call Stack \(most recent call first\):
FileTypo.cmake:4 \(write_compiler_detection_header\)
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/NoCompiler-stderr.txt
b/Tests/RunCMake/WriteCompilerDetectionHeader/NoCompiler-stderr.txt
index 61d1423..9451348 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/NoCompiler-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/NoCompiler-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:177 \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
Invalid arguments. write_compiler_detection_header requires at least one
compiler.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/NoFeature-stderr.txt
b/Tests/RunCMake/WriteCompilerDetectionHeader/NoFeature-stderr.txt
index a28cf6c..193f297 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/NoFeature-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/NoFeature-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:180 \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
Invalid arguments. write_compiler_detection_header requires at least one
feature.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/OldVersion-stderr.txt
b/Tests/RunCMake/WriteCompilerDetectionHeader/OldVersion-stderr.txt
index 6b34845..842eb3f 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/OldVersion-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/OldVersion-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at
/home/stephen/dev/src/cmake/Modules/WriteCompilerDetectionHeader.cmake:191
\(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
VERSION parameter too low.
Call Stack \(most recent call first\):
OldVersion.cmake:4 \(write_compiler_detection_header\)
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/PrefixTypo-stderr.txt
b/Tests/RunCMake/WriteCompilerDetectionHeader/PrefixTypo-stderr.txt
index 90277cd..5fdcdb8 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/PrefixTypo-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/PrefixTypo-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:169 \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
write_compiler_detection_header: PREFIX parameter missing.
Call Stack \(most recent call first\):
PrefixTypo.cmake:4 \(write_compiler_detection_header\)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/WriteCompilerDetectionHeader/ExtraArgs-stderr.txt | 2 +-
Tests/RunCMake/WriteCompilerDetectionHeader/FileTypo-stderr.txt | 2 +-
Tests/RunCMake/WriteCompilerDetectionHeader/NoCompiler-stderr.txt | 2 +-
Tests/RunCMake/WriteCompilerDetectionHeader/NoFeature-stderr.txt | 2 +-
Tests/RunCMake/WriteCompilerDetectionHeader/OldVersion-stderr.txt | 2 +-
Tests/RunCMake/WriteCompilerDetectionHeader/PrefixTypo-stderr.txt | 2 +-
6 files changed, 6 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
