[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2981-g143def6

[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  143def6e9a77c4854e19870b513e0f473b514647 (commit)
       via  86f1aad8cdca42033d040a55a16a4b7dabe3c70b (commit)
      from  7cb3ce38f75c1919dd6477f76cc873d5df0e48b1 (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=143def6e9a77c4854e19870b513e0f473b514647
commit 143def6e9a77c4854e19870b513e0f473b514647
Merge: 7cb3ce3 86f1aad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 15 13:22:11 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 15 13:22:11 2013 -0400

    Merge topic 'fix-moc-with-empty-COMPILE_DEFINITIONS' into next
    
    86f1aad Read the target defines unconditionally for Qt moc.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86f1aad8cdca42033d040a55a16a4b7dabe3c70b
commit 86f1aad8cdca42033d040a55a16a4b7dabe3c70b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 15 19:09:33 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 15 19:11:44 2013 +0200

    Read the target defines unconditionally for Qt moc.
    
    Commit 429e3699 (Process COMPILE_DEFINITIONS as generator expressions
    in QtAutomoc., 2013-01-25) introduced a check for the existence of the
    COMPILE_DEFINITIONS property on the target before processing it.
    
    At the time, compile definitions from linked targets were added to the
    COMPILE_DEFINITIONS property by target_link_libraries. The way such
    transitive compile definitions worked was changed in subsequent
    commit a1c4905f (Use the link information as a source of compile
    definitions and includes., 2013-02-12), so that the COMPILE_DEFINITIONS
    property may be empty, despite the fact that there are definitions
    which should be used.

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index a1fa31f..ff6f08c 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -280,13 +280,9 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
     _moc_incs += *incDirIt;
     }
 
-  const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
-  std::string _moc_compile_defs;
-  if (tmp)
-    {
-    _moc_compile_defs = target->GetCompileDefinitions(0);
-    }
-  tmp = makefile->GetProperty("COMPILE_DEFINITIONS");
+  std::string _moc_compile_defs = target->GetCompileDefinitions(0);
+
+  const char* tmp = makefile->GetProperty("COMPILE_DEFINITIONS");
   if (tmp)
     {
     _moc_compile_defs += ";";

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

Summary of changes:
 Source/cmQtAutomoc.cxx |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake