[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3048-gfd00f8f

[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  fd00f8f72d1cc957206911811a6d469362c2612e (commit)
       via  ea19a96fa3e74d0b669af80eae6f40bf019089c6 (commit)
      from  ac556d630510e80690e1f9617b0f64bea2f632f3 (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=fd00f8f72d1cc957206911811a6d469362c2612e
commit fd00f8f72d1cc957206911811a6d469362c2612e
Merge: ac556d6 ea19a96
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 11 08:14:22 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 11 08:14:22 2013 -0400

    Merge topic 'obsolete-qt4-macros' into next
    
    ea19a96 Replace path on my system with a regex.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea19a96fa3e74d0b669af80eae6f40bf019089c6
commit ea19a96fa3e74d0b669af80eae6f40bf019089c6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 11 14:13:33 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 11 14:13:33 2013 +0200

    Replace path on my system with a regex.

diff --git a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
index 5946cac..85c94b3 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
@@ -1,4 +1,4 @@
-CMake Warning at /home/stephen/dev/src/cmake/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
+CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
   The qt4_automoc macro is obsolete.  Use the CMAKE_AUTOMOC feature instead.
 Call Stack \(most recent call first\):
   AutomocMacro-WARN.cmake:9 \(qt4_automoc\)
diff --git a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
index 7dff1f1..64d8397 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
@@ -1,4 +1,4 @@
-CMake Warning at /home/stephen/dev/src/cmake/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
+CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
   The qt4_use_modules function is obsolete.  Use target_link_libraries with
   IMPORTED targets instead.
 Call Stack \(most recent call first\):

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

Summary of changes:
 .../ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt  |    2 +-
 .../UseModulesMacro-WARN-stderr.txt                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake