[Cmake-commits] CMake branch, next, updated. v2.8.5-1976-g8751cb9

[Alexander Neundorf]

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  8751cb9bbaa17902a9ffe30b18cfc2f1c7dce25c (commit)
       via  f15945edad8aba724b80914cf3b50f5cc9f5a021 (commit)
      from  3bf4d8587ddb25d33a578943d974474bfc419364 (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=8751cb9bbaa17902a9ffe30b18cfc2f1c7dce25c
commit 8751cb9bbaa17902a9ffe30b18cfc2f1c7dce25c
Merge: 3bf4d85 f15945e
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Sep 27 12:56:23 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 27 12:56:23 2011 -0400

    Merge topic 'ImproveFindPackageModeWithTryCompile' into next
    
    f15945e Use makefile->IssueMessage() for better error messages


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f15945edad8aba724b80914cf3b50f5cc9f5a021
commit f15945edad8aba724b80914cf3b50f5cc9f5a021
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Sep 27 18:59:42 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Sep 27 18:59:42 2011 +0200

    Use makefile->IssueMessage() for better error messages
    
    Alex

diff --git a/Source/cmTryCompileCommand.cxx b/Source/cmTryCompileCommand.cxx
index 546e42f..12ce015 100644
--- a/Source/cmTryCompileCommand.cxx
+++ b/Source/cmTryCompileCommand.cxx
@@ -23,7 +23,7 @@ bool cmTryCompileCommand
   if(this->Makefile->GetCMakeInstance()->GetWorkingMode() ==
                                                       cmake::FIND_PACKAGE_MODE)
     {
-    cmSystemTools::Error(
+    this->Makefile->IssueMessage(cmake::FATAL_ERROR,
          "The TRY_COMPILE() command is not supported in --find-package mode.");
     return false;
     }
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index 9044cf8..4fc0b13 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -25,7 +25,7 @@ bool cmTryRunCommand
   if(this->Makefile->GetCMakeInstance()->GetWorkingMode() ==
                                                       cmake::FIND_PACKAGE_MODE)
     {
-    cmSystemTools::Error(
+    this->Makefile->IssueMessage(cmake::FATAL_ERROR,
             "The TRY_RUN() command is not supported in --find-package mode.");
     return false;
     }

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

Summary of changes:
 Source/cmTryCompileCommand.cxx |    2 +-
 Source/cmTryRunCommand.cxx     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake