[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5819-g1a7f705

[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  1a7f705303e1f443723f63df8cac6eb41170cdc2 (commit)
       via  89f76ad848e68021c41a8497e1eae6e1292ac152 (commit)
      from  318f76940f8ce5fca31c02b8caf4ce007057642f (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=1a7f705303e1f443723f63df8cac6eb41170cdc2
commit 1a7f705303e1f443723f63df8cac6eb41170cdc2
Merge: 318f769 89f76ad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 26 05:52:42 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 26 05:52:42 2013 -0500

    Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
    
    89f76ad Export the INTERFACE_AUTOUIC_OPTIONS.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89f76ad848e68021c41a8497e1eae6e1292ac152
commit 89f76ad848e68021c41a8497e1eae6e1292ac152
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 26 01:26:49 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 26 11:52:21 2013 +0100

    Export the INTERFACE_AUTOUIC_OPTIONS.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 50835e2..0d0d05b 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -77,6 +77,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
+    this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS", te,
+                                    cmGeneratorExpression::BuildInterface,
+                                    properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
     const bool newCMP0022Behavior =
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index ad17556..79e78df 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -140,6 +140,10 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
                                   te,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
+    this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS",
+                                  te,
+                                  cmGeneratorExpression::InstallInterface,
+                                  properties, missingTargets);
 
     const bool newCMP0022Behavior =
                               te->GetPolicyStatusCMP0022() != cmPolicies::WARN

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

Summary of changes:
 Source/cmExportBuildFileGenerator.cxx   |    3 +++
 Source/cmExportInstallFileGenerator.cxx |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake