[Cmake-commits] CMake branch, next, updated. v3.0.2-5460-g741c1f0

[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  741c1f0afed9145e6df91079f62b0dbc7238406f (commit)
       via  b9e3607bd566ff9a9e641b0bbc9192bd2f84aebb (commit)
      from  8abd55d1ac14a8421ab113d0b00ebd98e502f6a1 (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=741c1f0afed9145e6df91079f62b0dbc7238406f
commit 741c1f0afed9145e6df91079f62b0dbc7238406f
Merge: 8abd55d b9e3607
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 26 02:59:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 26 02:59:17 2014 -0400

    Merge topic 'autorcc-depends' into next
    
    b9e3607b Remove some old code.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9e3607bd566ff9a9e641b0bbc9192bd2f84aebb
commit b9e3607bd566ff9a9e641b0bbc9192bd2f84aebb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 26 08:57:51 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 26 08:57:51 2014 +0200

    Remove some old code.

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 5944d67..b344a26 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -147,12 +147,10 @@ if (NOT CMAKE_GENERATOR STREQUAL Ninja)
   file(STRINGS "${info_file}" qrc_files)
 
   list(GET qrc_files 0 qrc_file1)
-  list(GET qrc_files 1 qrc_file2)
 
   set(timeformat "%Y%j%H%M%S")
 
   file(TIMESTAMP "${qrc_file1}" file1_before "${timeformat}")
-  file(TIMESTAMP "${qrc_file2}" file2_before "${timeformat}")
 
   execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${CMAKE_CURRENT_SOURCE_DIR}/autorcc_depends/res1_input.txt")
   execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1) # Ensure that the timestamp will change.
@@ -162,48 +160,8 @@ if (NOT CMAKE_GENERATOR STREQUAL Ninja)
   )
 
   file(TIMESTAMP "${qrc_file1}" file1_step1 "${timeformat}")
-  file(TIMESTAMP "${qrc_file2}" file2_step1 "${timeformat}")
 
-  if (NOT file2_step1 STREQUAL file2_before)
-    message(SEND_ERROR "file2 (${qrc_file2}) should not have changed in the first step!")
-  endif()
   if (NOT file1_step1 GREATER file1_before)
     message(SEND_ERROR "file1 (${qrc_file1}) should have changed in the first step!")
   endif()
-
-  execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${CMAKE_CURRENT_SOURCE_DIR}/autorcc_depends/res2_input.txt")
-  execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
-
-  execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends"
-  )
-
-  file(TIMESTAMP "${qrc_file1}" file1_step2 "${timeformat}")
-  file(TIMESTAMP "${qrc_file2}" file2_step2 "${timeformat}")
-
-  if (NOT file1_step2 STREQUAL file1_step1)
-    message("file1 timestamp after second build: ${file1_step2}")
-
-    execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
-    execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends"
-    )
-    file(TIMESTAMP "${qrc_file1}" file1_step3 "${timeformat}")
-
-    message("file1 timestamp after third build: ${file1_step3}")
-
-    execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
-    execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends"
-    )
-    file(TIMESTAMP "${qrc_file1}" file1_step4 "${timeformat}")
-
-    message("file1 timestamp after fourth build: ${file1_step4}")
-
-    message(SEND_ERROR "file1 (${qrc_file1}) should not have changed in the second step!")
-  endif()
-  if (NOT file2_step2 GREATER file2_before)
-    message(SEND_ERROR "file2 (${qrc_file2}) should have changed in the second step!")
-  endif()
-
 endif()

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

Summary of changes:
 Tests/QtAutogen/CMakeLists.txt |   42 ----------------------------------------
 1 file changed, 42 deletions(-)


hooks/post-receive
-- 
CMake