[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1868-gf50de90

[Stephen Kelly]

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  f50de9013022810e810f43c11505c69458f00189 (commit)
       via  87fdaf9d836979de828bd0299a322a0413651a52 (commit)
       via  dc952daf00ad0bf93e70aa61d7865682c0940e25 (commit)
      from  773d91fa63f2c2c35b4ae6afa972f86986611d82 (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=f50de9013022810e810f43c11505c69458f00189
commit f50de9013022810e810f43c11505c69458f00189
Merge: 773d91f 87fdaf9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 4 02:52:27 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 4 02:52:27 2014 -0400

    Merge topic 'cxx11-features' into next
    
    87fdaf9d Fix expected message.
    dc952daf Fix width.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87fdaf9d836979de828bd0299a322a0413651a52
commit 87fdaf9d836979de828bd0299a322a0413651a52
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 4 08:51:52 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Apr 4 08:51:52 2014 +0200

    Fix expected message.

diff --git a/Tests/RunCMake/target_compile_features/not_a_cxx_feature-stderr.txt b/Tests/RunCMake/target_compile_features/not_a_cxx_feature-stderr.txt
index a27030f..efa2bad 100644
--- a/Tests/RunCMake/target_compile_features/not_a_cxx_feature-stderr.txt
+++ b/Tests/RunCMake/target_compile_features/not_a_cxx_feature-stderr.txt
@@ -1,4 +1,5 @@
 CMake Error at not_a_cxx_feature.cmake:3 \(target_compile_features\):
-  target_compile_features specified unknown feature "cxx_not_a_feature".
+  target_compile_features specified unknown feature "cxx_not_a_feature" for
+  target "main".
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc952daf00ad0bf93e70aa61d7865682c0940e25
commit dc952daf00ad0bf93e70aa61d7865682c0940e25
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 4 08:46:20 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Apr 4 08:46:20 2014 +0200

    Fix width.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fc6aef2..1232981 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4592,7 +4592,8 @@ AddRequiredTargetFeature(cmTarget *target, const std::string& feature,
     cmOStringStream e;
     e << "The compiler feature \"" << feature
       << "\" is not known to compiler\n\""
-      << this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID") << "\"\nversion "
+      << this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID")
+      << "\"\nversion "
       << this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << ".";
     this->IssueMessage(cmake::FATAL_ERROR, e.str());
     return false;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx                                               |    3 ++-
 Tests/RunCMake/target_compile_features/not_a_cxx_feature-stderr.txt |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake