[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6058-gbe73607

[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  be7360790b583021f89457500171a29fa1784d33 (commit)
       via  fcc0f09d235c37f33bfd053b4e2d84b503807a0e (commit)
      from  c974f9c252be30b61659a2dbd9b96bff80016a9e (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=be7360790b583021f89457500171a29fa1784d33
commit be7360790b583021f89457500171a29fa1784d33
Merge: c974f9c fcc0f09
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 5 08:54:11 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 5 08:54:11 2013 -0500

    Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
    
    fcc0f09 Evidently I for got to pop stash.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcc0f09d235c37f33bfd053b4e2d84b503807a0e
commit fcc0f09d235c37f33bfd053b4e2d84b503807a0e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 5 14:51:34 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Dec 5 14:51:34 2013 +0100

    Evidently I for got to pop stash.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index be6bb52..c1e4eee 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4385,7 +4385,7 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
     {
     case BoolType:
     case StringType:
-      return "(Agree)\n";
+      return dominant ? "(Disagree)\n" : "(Agree)\n";
     case NumberMaxType:
     case NumberMinType:
       return dominant ? "(Dominant)\n" : "(Ignored)\n";
@@ -4475,6 +4475,8 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
         {
         PropertyType consistent = consistentProperty(propContent,
                                                      ifacePropContent, t);
+        report += reportEntry;
+        report += compatibilityAgree(t, propContent != consistent);
         if (!consistent)
           {
           cmOStringStream e;
@@ -4487,8 +4489,6 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
           }
         else
           {
-          report += reportEntry;
-          report += compatibilityAgree(t, propContent != consistent);
           propContent = consistent;
           continue;
           }
@@ -4513,6 +4513,8 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
         {
         PropertyType consistent = consistentProperty(propContent,
                                                      ifacePropContent, t);
+        report += reportEntry;
+        report += compatibilityAgree(t, propContent != consistent);
         if (!consistent)
           {
           cmOStringStream e;
@@ -4526,8 +4528,6 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
           }
         else
           {
-          report += reportEntry;
-          report += compatibilityAgree(t, propContent != consistent);
           propContent = consistent;
           continue;
           }
@@ -4546,6 +4546,8 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
           {
           PropertyType consistent = consistentProperty(propContent,
                                                        ifacePropContent, t);
+          report += reportEntry;
+          report += compatibilityAgree(t, propContent != consistent);
           if (!consistent)
             {
             cmOStringStream e;
@@ -4558,8 +4560,6 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
             }
           else
             {
-            report += reportEntry;
-            report += compatibilityAgree(t, propContent != consistent);
             propContent = consistent;
             continue;
             }
diff --git a/Tests/RunCMake/CompatibleInterface/AutoUic.cmake b/Tests/RunCMake/CompatibleInterface/AutoUic.cmake
index 32aa797..86bd5a0 100644
--- a/Tests/RunCMake/CompatibleInterface/AutoUic.cmake
+++ b/Tests/RunCMake/CompatibleInterface/AutoUic.cmake
@@ -4,6 +4,10 @@ find_package(Qt4 REQUIRED)
 set(QT_CORE_TARGET Qt4::QtCore)
 set(QT_GUI_TARGET Qt4::QtGui)
 
+set(CMAKE_AUTOUIC ON)
+
+set(CMAKE_DEBUG_TARGET_PROPERTIES AUTOUIC_OPTIONS)
+
 add_library(KI18n INTERFACE)
 set_property(TARGET KI18n APPEND PROPERTY
   INTERFACE_AUTOUIC_OPTIONS -tr ki18n

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

Summary of changes:
 Source/cmTarget.cxx                              |   14 +++++++-------
 Tests/RunCMake/CompatibleInterface/AutoUic.cmake |    4 ++++
 2 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake