[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6078-gb5f27dd

[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  b5f27dd140db8600c32ecd266ab902a307144f2e (commit)
       via  b1c3b69d7c4f7cb0b53c3d4212f312a75563170e (commit)
      from  38dc376b5ae0f550979912398782cd0e75ff976e (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=b5f27dd140db8600c32ecd266ab902a307144f2e
commit b5f27dd140db8600c32ecd266ab902a307144f2e
Merge: 38dc376 b1c3b69
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 5 19:42:46 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 5 19:42:46 2013 -0500

    Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
    
    b1c3b69 Fix tests.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1c3b69d7c4f7cb0b53c3d4212f312a75563170e
commit b1c3b69d7c4f7cb0b53c3d4212f312a75563170e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Dec 3 13:26:51 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Dec 6 01:42:02 2013 +0100

    Fix tests.

diff --git a/Tests/RunCMake/CompatibleInterface/AutoUicresult.txt b/Tests/RunCMake/CompatibleInterface/AutoUic-result.txt
similarity index 100%
rename from Tests/RunCMake/CompatibleInterface/AutoUicresult.txt
rename to Tests/RunCMake/CompatibleInterface/AutoUic-result.txt
diff --git a/Tests/RunCMake/CompatibleInterface/AutoUic-stderr.txt b/Tests/RunCMake/CompatibleInterface/AutoUic-stderr.txt
new file mode 100644
index 0000000..09f9461
--- /dev/null
+++ b/Tests/RunCMake/CompatibleInterface/AutoUic-stderr.txt
@@ -0,0 +1,11 @@
+CMake Error: The INTERFACE_AUTOUIC_OPTIONS property of "OtherI18n" does
+not agree with the value of AUTOUIC_OPTIONS already determined
+for "LibWidget".
+
+CMake Debug Log:
+  String compatibility of property "AUTOUIC_OPTIONS" for target "LibWidget"
+  \(result: "-tr;ki18n"\):
+
+   \* Target "LibWidget" property not set.
+   \* Target "KI18n" property value "-tr;ki18n" \(Interface set\)
+   \* Target "OtherI18n" property value "-tr;otheri18n" \(Disagree\)
diff --git a/Tests/RunCMake/CompatibleInterface/AutoUicstderr.txt b/Tests/RunCMake/CompatibleInterface/AutoUicstderr.txt
deleted file mode 100644
index 706f2ef..0000000
--- a/Tests/RunCMake/CompatibleInterface/AutoUicstderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-sdsdsd

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

Summary of changes:
 .../{AutoUicresult.txt => AutoUic-result.txt}      |    0
 .../CompatibleInterface/AutoUic-stderr.txt         |   11 +++++++++++
 .../RunCMake/CompatibleInterface/AutoUicstderr.txt |    1 -
 3 files changed, 11 insertions(+), 1 deletions(-)
 rename Tests/RunCMake/CompatibleInterface/{AutoUicresult.txt => AutoUic-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CompatibleInterface/AutoUic-stderr.txt
 delete mode 100644 Tests/RunCMake/CompatibleInterface/AutoUicstderr.txt


hooks/post-receive
-- 
CMake