[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5244-gac89ded

[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  ac89ded5d0c49d98c60fb89428f1c957939cf934 (commit)
       via  cb216b15b2ff48bd97b88e48973a972cf777ae2c (commit)
      from  21c6d4aea1c66adf86f10b1e195c3392883f523c (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=ac89ded5d0c49d98c60fb89428f1c957939cf934
commit ac89ded5d0c49d98c60fb89428f1c957939cf934
Merge: 21c6d4a cb216b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 18 06:25:28 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 18 06:25:28 2013 -0500

    Merge topic 'autogen-depends' into next
    
    cb216b1 Revert "cmQtAutogen: Allow specifying depends for autogen targets."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb216b15b2ff48bd97b88e48973a972cf777ae2c
commit cb216b15b2ff48bd97b88e48973a972cf777ae2c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 18 12:25:05 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Nov 18 12:25:05 2013 +0100

    Revert "cmQtAutogen: Allow specifying depends for autogen targets."
    
    This reverts commit 53f148947c454b925504b4ec6bcce89cfa3397e7.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 3a5056a..36cb368 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -204,11 +204,6 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target)
                                     "", makefile->GetCurrentOutputDirectory());
 
   std::vector<std::string> depends;
-  if (const char *autogenDepends =
-                                target->GetProperty("AUTOGEN_TARGET_DEPENDS"))
-    {
-    cmSystemTools::ExpandListArgument(autogenDepends, depends);
-    }
   std::vector<std::string> toolNames;
   if (target->GetPropertyAsBool("AUTOMOC"))
     {
@@ -447,8 +442,9 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget* target,
     std::string absFile = cmsys::SystemTools::GetRealPath(
                                                     sf->GetFullPath().c_str());
     bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"));
+    bool generated = cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"));
 
-    if (absFile.find("_automoc.cpp") == std::string::npos)
+    if (!generated)
       {
       if (skip)
         {
@@ -1331,9 +1327,6 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
                std::ios::out | std::ios::trunc);
   outfile << automocSource;
   outfile.close();
-  cmSourceFile* automocCppSource
-          = makefile->GetOrCreateSource(this->OutMocCppFilename.c_str(), true);
-  automocCppSource->SetProperty("SKIP_AUTOMOC", "1");
 
   return true;
 }
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 54d24a0..7991c4e 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -43,19 +43,10 @@ add_library(codeeditorLib STATIC codeeditor.cpp)
 
 add_library(privateSlot OBJECT private_slot.cpp)
 
-add_custom_target(generate_moc_input
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/generated.h.in" "${CMAKE_CURRENT_BINARY_DIR}"
-  COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_CURRENT_BINARY_DIR}/generated.h.in" "${CMAKE_CURRENT_BINARY_DIR}/generated.h"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/generated.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}"
-  COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_CURRENT_BINARY_DIR}/generated.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/generated.cpp"
-)
-set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/generated.cpp" PROPERTIES GENERATED TRUE)
-
 add_executable(QtAutogen main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp abc.cpp
                xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot>
-               test.qrc resourcetester.cpp "${CMAKE_CURRENT_BINARY_DIR}/generated.cpp"
+               test.qrc resourcetester.cpp
 )
-set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS generate_moc_input)
 
 set_target_properties(QtAutogen codeeditorLib privateSlot PROPERTIES AUTOMOC TRUE)
 
diff --git a/Tests/QtAutogen/generated.cpp.in b/Tests/QtAutogen/generated.cpp.in
deleted file mode 100644
index f53bf53..0000000
--- a/Tests/QtAutogen/generated.cpp.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#include "generated.h"
-
-Generated::Generated(QObject *parent)
-  : QObject(parent)
-{
-
-}
-
-#include "moc_generated.cpp"
diff --git a/Tests/QtAutogen/generated.h.in b/Tests/QtAutogen/generated.h.in
deleted file mode 100644
index 5422f02..0000000
--- a/Tests/QtAutogen/generated.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#ifndef GENERATED_H
-#define GENERATED_H
-
-#include <QObject>
-
-class Generated : public QObject
-{
-  Q_OBJECT
-public:
-  explicit Generated(QObject *parent = 0);
-};
-
-#endif

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx    |   11 ++---------
 Tests/QtAutogen/CMakeLists.txt   |   11 +----------
 Tests/QtAutogen/generated.cpp.in |   10 ----------
 Tests/QtAutogen/generated.h.in   |   14 --------------
 4 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 Tests/QtAutogen/generated.cpp.in
 delete mode 100644 Tests/QtAutogen/generated.h.in


hooks/post-receive
-- 
CMake