[Cmake-commits] CMake branch, next, updated. v2.8.11-2035-gd9e536b

[Brad King]

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  d9e536b8dbd685beda958e7a97ab1889d9f5afaa (commit)
       via  33ed186fce561d274ffee1acd20c2ceb45931de4 (commit)
      from  2c3f2f7fdaf9ccb2325410a7dacd22a8a2428598 (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=d9e536b8dbd685beda958e7a97ab1889d9f5afaa
commit d9e536b8dbd685beda958e7a97ab1889d9f5afaa
Merge: 2c3f2f7 33ed186
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 16 14:45:51 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 14:45:51 2013 -0400

    Merge topic 'fix-moc-with-empty-COMPILE_DEFINITIONS' into next
    
    33ed186 automoc: Read target defines unconditionally


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33ed186fce561d274ffee1acd20c2ceb45931de4
commit 33ed186fce561d274ffee1acd20c2ceb45931de4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 15 19:09:33 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 16 14:43:45 2013 -0400

    automoc: Read target defines unconditionally
    
    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:


hooks/post-receive
-- 
CMake