[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-479-ga66a83c

[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  a66a83cd811701e47f6a378897cee3012f1bfbf8 (commit)
       via  1a2f178c278f6ed2fa21f3014cb16547db1dcefe (commit)
      from  c78ae741da1a4cc4f81338791de6d797918c7016 (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=a66a83cd811701e47f6a378897cee3012f1bfbf8
commit a66a83cd811701e47f6a378897cee3012f1bfbf8
Merge: c78ae74 1a2f178
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 4 10:50:05 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 4 10:50:05 2014 -0500

    Merge topic 'fix-Qt4-moc-command-depends' into next
    
    1a2f178c Revert "Qt4: Fix moc command dependencies for incremental build."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a2f178c278f6ed2fa21f3014cb16547db1dcefe
commit 1a2f178c278f6ed2fa21f3014cb16547db1dcefe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 4 16:49:05 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Mar 4 16:49:05 2014 +0100

    Revert "Qt4: Fix moc command dependencies for incremental build."
    
    This reverts commit ee9410a94e2a1a02b3183848bce9e48eb602c4bd.
    
    This requires evaluation of the DEPENDS as generator expressions,
    which is not yet possible.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 2caa2bf..df2318b 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -141,7 +141,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
   set(_moc_extra_parameters_file @${_moc_parameters_file})
   add_custom_command(OUTPUT ${outfile}
                       COMMAND Qt4::moc ${_moc_extra_parameters_file}
-                      DEPENDS ${infile} ${_moc_parameters_file}
+                      DEPENDS ${infile}
                       ${_moc_working_dir}
                       VERBATIM)
 endmacro ()
diff --git a/Tests/Qt4Targets/CMakeLists.txt b/Tests/Qt4Targets/CMakeLists.txt
index 0128118..af9fc3f 100644
--- a/Tests/Qt4Targets/CMakeLists.txt
+++ b/Tests/Qt4Targets/CMakeLists.txt
@@ -36,24 +36,3 @@ add_executable(Qt4WrapMacroTest WIN32 main_wrap_test.cpp ${moc_file})
 set_property(TARGET Qt4WrapMacroTest PROPERTY AUTOMOC OFF)
 target_include_directories(Qt4WrapMacroTest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/interface")
 target_link_libraries(Qt4WrapMacroTest Qt4::QtGui)
-
-set(timeformat "%Y%j%H%M%S")
-file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
-execute_process(COMMAND "${CMAKE_COMMAND}" -DADD_DEF=0 "-H${CMAKE_CURRENT_SOURCE_DIR}/IncrementalMoc" "-B${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
-execute_process(COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
-file(TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild/moc_foo.cpp" tsvar_before "${timeformat}")
-if (NOT tsvar_before)
-  message(SEND_ERROR "Unable to read timestamp from moc file from first build!")
-endif()
-
-execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1) # Ensure that at least a second passes.
-execute_process(COMMAND "${CMAKE_COMMAND}" -DADD_DEF=1 "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
-execute_process(COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
-file(TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild/moc_foo.cpp" tsvar_after "${timeformat}")
-if (NOT tsvar_after)
-  message(SEND_ERROR "Unable to read timestamp from moc file from first build!")
-endif()
-
-if (NOT tsvar_after GREATER tsvar_before)
-  message(SEND_ERROR "Rebuild did not re-create moc file. Before: ${tsvar_before}. After: ${tsvar_after}")
-endif()
diff --git a/Tests/Qt4Targets/IncrementalMoc/CMakeLists.txt b/Tests/Qt4Targets/IncrementalMoc/CMakeLists.txt
deleted file mode 100644
index 4ba0ced..0000000
--- a/Tests/Qt4Targets/IncrementalMoc/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-cmake_minimum_required(VERSION 2.8.12)
-project(IncrementalMoc)
-
-find_package(Qt4 REQUIRED)
-
-qt4_generate_moc(foo.h moc_foo.cpp)
-
-add_library(testlib foo.cpp moc_foo.cpp)
-target_link_libraries(testlib Qt4::QtCore)
-if (ADD_DEF)
-  target_compile_definitions(testlib PRIVATE NEW_DEF)
-endif()
diff --git a/Tests/Qt4Targets/IncrementalMoc/foo.cpp b/Tests/Qt4Targets/IncrementalMoc/foo.cpp
deleted file mode 100644
index e924f7e..0000000
--- a/Tests/Qt4Targets/IncrementalMoc/foo.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#include "foo.h"
-
-Foo::Foo()
-  : QObject(0)
-{
-
-}
diff --git a/Tests/Qt4Targets/IncrementalMoc/foo.h b/Tests/Qt4Targets/IncrementalMoc/foo.h
deleted file mode 100644
index 38d899f..0000000
--- a/Tests/Qt4Targets/IncrementalMoc/foo.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#include <QObject>
-
-class Foo : QObject
-{
-  Q_OBJECT
-public:
-  Foo();
-};

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

Summary of changes:
 Modules/Qt4Macros.cmake                        |    2 +-
 Tests/Qt4Targets/CMakeLists.txt                |   21 ---------------------
 Tests/Qt4Targets/IncrementalMoc/CMakeLists.txt |   13 -------------
 Tests/Qt4Targets/IncrementalMoc/foo.cpp        |    8 --------
 Tests/Qt4Targets/IncrementalMoc/foo.h          |    9 ---------
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 Tests/Qt4Targets/IncrementalMoc/CMakeLists.txt
 delete mode 100644 Tests/Qt4Targets/IncrementalMoc/foo.cpp
 delete mode 100644 Tests/Qt4Targets/IncrementalMoc/foo.h


hooks/post-receive
-- 
CMake