[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-537-g5c64879

[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  5c64879caa348491590f7d26009c3f09171222ab (commit)
       via  876ea0174bc5bfd3a47894b8b10f5358839191ab (commit)
      from  75e20696418f67eb2517bd078b23ce0764cfc218 (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=5c64879caa348491590f7d26009c3f09171222ab
commit 5c64879caa348491590f7d26009c3f09171222ab
Merge: 75e2069 876ea01
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 09:50:49 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 6 09:50:49 2014 -0500

    Merge topic 'test-AUTOGEN-custom-command-depends' into next
    
    876ea017 Revert "QtAutogen: Fix AUTOGEN depends on custom command output with VS."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=876ea0174bc5bfd3a47894b8b10f5358839191ab
commit 876ea0174bc5bfd3a47894b8b10f5358839191ab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 09:50:54 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 6 09:51:06 2014 -0500

    Revert "QtAutogen: Fix AUTOGEN depends on custom command output with VS."
    
    This reverts commit 2ed0d06691d5123d92395208338a361b23ec3d62.
    Temporarily revert this change to make room for sweeping API changes.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 31026b6..dfb310e 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -261,37 +261,20 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target)
     //  https://connect.microsoft.com/VisualStudio/feedback/details/769495
     usePRE_BUILD = vslg->GetVersion() >= cmLocalVisualStudioGenerator::VS7;
     }
-  std::vector<std::string> prebuildDeps;
   if(usePRE_BUILD)
     {
-    for (std::vector<std::string>::iterator it = depends.begin();
-          it != depends.end(); )
-      {
-      if(makefile->FindTargetToUse(it->c_str()))
-        {
-        // The PRE_BUILD handling below can not handle non-targets.
-        prebuildDeps.push_back(*it);
-        it = depends.erase(it);
-        }
-      else
-        {
-        ++it;
-        }
-      }
-
     // Add the pre-build command directly to bypass the OBJECT_LIBRARY
     // rejection in cmMakefile::AddCustomCommandToTarget because we know
     // PRE_BUILD will work for an OBJECT_LIBRARY in this specific case.
     std::vector<std::string> no_output;
-    cmCustomCommand cc(makefile, no_output, prebuildDeps,
+    cmCustomCommand cc(makefile, no_output, depends,
                        commandLines, autogenComment.c_str(),
                        workingDirectory.c_str());
     cc.SetEscapeOldStyle(false);
     cc.SetEscapeAllowMakeVars(true);
     target->AddPreBuildCommand(cc);
     }
-
-  if(!usePRE_BUILD || !depends.empty())
+  else
 #endif
     {
     cmTarget* autogenTarget = makefile->AddUtilityCommand(
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 0821b45..4da125f 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -58,17 +58,11 @@ add_custom_target(generate_moc_input
   COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_CURRENT_BINARY_DIR}/myinterface.h.in" "${CMAKE_CURRENT_BINARY_DIR}/myinterface.h"
 )
 
-add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in" "${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h"
-  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in"
-)
-
 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 generated.cpp
 )
-set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS generate_moc_input "${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h")
+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.h b/Tests/QtAutogen/generated.h
index b6c2711..dd22489 100644
--- a/Tests/QtAutogen/generated.h
+++ b/Tests/QtAutogen/generated.h
@@ -5,12 +5,11 @@
 #include <QObject>
 
 #include "myinterface.h"
-#include "myotherinterface.h"
 
-class Generated : public QObject, MyInterface, MyOtherInterface
+class Generated : public QObject, MyInterface
 {
   Q_OBJECT
-  Q_INTERFACES(MyInterface MyOtherInterface)
+  Q_INTERFACES(MyInterface)
 public:
   explicit Generated(QObject *parent = 0);
 };
diff --git a/Tests/QtAutogen/myotherinterface.h.in b/Tests/QtAutogen/myotherinterface.h.in
deleted file mode 100644
index d21e7af..0000000
--- a/Tests/QtAutogen/myotherinterface.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#ifndef MYOTHERINTERFACE_H
-#define MYOTHERINTERFACE_H
-
-#include <QObject>
-
-class MyOtherInterface
-{
-
-};
-
-Q_DECLARE_INTERFACE(MyOtherInterface, "org.cmake.example.MyOtherInterface")
-
-#endif

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

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


hooks/post-receive
-- 
CMake