[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7286-g0a7c646

[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  0a7c646df06e81beb2a73be9d72b65f876ee2e1c (commit)
       via  6ed3d6864111474c5f976ee752d17c8cfa337fc4 (commit)
       via  5373bdf445c809ea17e14df4e49eb3e21934aed0 (commit)
      from  3dc1163bf843730e59542cff690e90396cc993b3 (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=0a7c646df06e81beb2a73be9d72b65f876ee2e1c
commit 0a7c646df06e81beb2a73be9d72b65f876ee2e1c
Merge: 3dc1163 6ed3d68
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 27 11:06:04 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 27 11:06:04 2014 -0500

    Merge topic 'fix-Qt-autogen' into next
    
    6ed3d686 Only gather source files for AUTOMOC and AUTOUIC.
    5373bdf4 Fix target existence check.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ed3d6864111474c5f976ee752d17c8cfa337fc4
commit 6ed3d6864111474c5f976ee752d17c8cfa337fc4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 27 17:04:51 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jan 27 17:04:51 2014 +0100

    Only gather source files for AUTOMOC and AUTOUIC.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 37b356a..cab59fe 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -379,7 +379,11 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget const* target)
   std::map<std::string, std::string> configDefines;
   std::map<std::string, std::string> configUicOptions;
 
-  this->SetupSourceFiles(target);
+  if (target->GetPropertyAsBool("AUTOMOC")
+      || target->GetPropertyAsBool("AUTOUIC"))
+    {
+    this->SetupSourceFiles(target);
+    }
   makefile->AddDefinition("_cpp_files",
           cmLocalGenerator::EscapeForCMake(this->Sources.c_str()).c_str());
   if (target->GetPropertyAsBool("AUTOMOC"))

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5373bdf445c809ea17e14df4e49eb3e21934aed0
commit 5373bdf445c809ea17e14df4e49eb3e21934aed0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 27 17:04:36 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jan 27 17:04:36 2014 +0100

    Fix target existence check.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 6628214..2d2feae 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1191,7 +1191,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
       PATHS ${QT_BINARY_DIR}
       NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
       )
-    if (${VAR} AND NOT TARGET NAME)
+    if (${VAR} AND NOT TARGET ${NAME})
       add_executable(${NAME} IMPORTED)
       set_property(TARGET ${NAME} PROPERTY IMPORTED_LOCATION ${${VAR}})
     endif()

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

Summary of changes:
 Modules/FindQt4.cmake         |    2 +-
 Source/cmQtAutoGenerators.cxx |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake