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 2dbe24798a0a72535485ca08a6a1f52835baab7a (commit)
via 96b35db6e8335a7e9b4eda2e009521406fced4a6 (commit)
via 41fdd4f460567021ef9e59b697788ce8403a4510 (commit)
via 4cedd8ec569ba6c0bba1fca4df0a20dd7e23061f (commit)
via 274df2dac740f3c80b8be8b2278824b173311a0b (commit)
from 2040bb2a6f3ab2121af8b04dbc49b460384b6acd (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=2dbe24798a0a72535485ca08a6a1f52835baab7a
commit 2dbe24798a0a72535485ca08a6a1f52835baab7a
Merge: 2040bb2 96b35db
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Sep 24 10:26:24 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 24 10:26:24 2014 -0400
Merge topic 'autorcc-depends' into next
96b35db6 Add debugging information for the autorcc_depends test.
41fdd4f4 Ensure that the initial build works.
4cedd8ec Add a glob for debugging.
274df2da Exclude this test when using the Ninja generator for now.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96b35db6e8335a7e9b4eda2e009521406fced4a6
commit 96b35db6e8335a7e9b4eda2e009521406fced4a6
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Sep 24 16:22:17 2014 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Sep 24 16:25:43 2014 +0200
Add debugging information for the autorcc_depends test.
The test_res1 target should not be re-built at this point because
its dependencies have not changed. Test whether the test_res1 target
is just built every time make is run.
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 125dcff..0f53a87 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -182,6 +182,24 @@ if (NOT CMAKE_GENERATOR STREQUAL Ninja)
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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41fdd4f460567021ef9e59b697788ce8403a4510
commit 41fdd4f460567021ef9e59b697788ce8403a4510
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Sep 24 16:19:13 2014 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Sep 24 16:25:43 2014 +0200
Ensure that the initial build works.
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 04fdafa..125dcff 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -123,6 +123,9 @@ if (NOT CMAKE_GENERATOR STREQUAL Ninja)
CMAKE_FLAGS "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
"-DQT_TEST_VERSION=${QT_TEST_VERSION}"
OUTPUT_VARIABLE output
)
+ if (NOT RCC_DEPENDS)
+ message(SEND_ERROR "Initial build of autorcc_depends failed. Output:
${output}")
+ endif()
set(info_file "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt")
if (NOT EXISTS ${info_file})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cedd8ec569ba6c0bba1fca4df0a20dd7e23061f
commit 4cedd8ec569ba6c0bba1fca4df0a20dd7e23061f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Sep 24 16:17:51 2014 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Sep 24 16:25:43 2014 +0200
Add a glob for debugging.
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index d99c787..04fdafa 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -135,6 +135,8 @@ if (NOT CMAKE_GENERATOR STREQUAL Ninja)
endif()
endforeach()
if (NOT info_file)
+ file(GLOB info_files
"${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file*" )
+ message("info_files glob: ${info_files}")
message(SEND_ERROR "No valid info_file found!")
endif()
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=274df2dac740f3c80b8be8b2278824b173311a0b
commit 274df2dac740f3c80b8be8b2278824b173311a0b
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Sep 24 15:52:58 2014 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Sep 24 16:24:39 2014 +0200
Exclude this test when using the Ninja generator for now.
For an unknown reason, touching the gen1_input.txt regenerates
the generated.txt file and that triggers re-running rcc and
re-generating qrc_res1_gen.cpp, however, that cpp file is not
compiled and linked into the exe until the next time ninja is
run.
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index ff58bf9..d99c787 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -114,69 +114,73 @@ qtx_wrap_cpp(uicOnlyMoc sub/uiconly.h)
add_executable(uiconly sub/uiconly.cpp ${uicOnlyMoc})
target_link_libraries(uiconly ${QT_LIBRARIES})
-try_compile(RCC_DEPENDS
- "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends"
- "${CMAKE_CURRENT_SOURCE_DIR}/autorcc_depends"
- autorcc_depends
- CMAKE_FLAGS "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
"-DQT_TEST_VERSION=${QT_TEST_VERSION}"
- OUTPUT_VARIABLE output
-)
-
-set(info_file "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt")
-if (NOT EXISTS ${info_file})
- unset(info_file)
- foreach(_config ${CMAKE_CONFIGURATION_TYPES})
- set(_info_file
"${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file_${config}.txt")
- if (EXISTS ${_info_file})
- set(info_file ${_info_file})
- break()
+if (NOT CMAKE_GENERATOR STREQUAL Ninja)
+
+ try_compile(RCC_DEPENDS
+ "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends"
+ "${CMAKE_CURRENT_SOURCE_DIR}/autorcc_depends"
+ autorcc_depends
+ CMAKE_FLAGS "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
"-DQT_TEST_VERSION=${QT_TEST_VERSION}"
+ OUTPUT_VARIABLE output
+ )
+
+ set(info_file "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt")
+ if (NOT EXISTS ${info_file})
+ unset(info_file)
+ foreach(_config ${CMAKE_CONFIGURATION_TYPES})
+ set(_info_file
"${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file_${config}.txt")
+ if (EXISTS ${_info_file})
+ set(info_file ${_info_file})
+ break()
+ endif()
+ endforeach()
+ if (NOT info_file)
+ message(SEND_ERROR "No valid info_file found!")
endif()
- endforeach()
- if (NOT info_file)
- message(SEND_ERROR "No valid info_file found!")
endif()
-endif()
-file(STRINGS "${info_file}" qrc_files)
+ file(STRINGS "${info_file}" qrc_files)
-list(GET qrc_files 0 qrc_file1)
-list(GET qrc_files 1 qrc_file2)
+ list(GET qrc_files 0 qrc_file1)
+ list(GET qrc_files 1 qrc_file2)
-set(timeformat "%Y%j%H%M%S")
+ set(timeformat "%Y%j%H%M%S")
-file(TIMESTAMP "${qrc_file1}" file1_before "${timeformat}")
-file(TIMESTAMP "${qrc_file2}" file2_before "${timeformat}")
+ 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.
+ 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.
-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends"
-)
+ execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends"
+ )
-file(TIMESTAMP "${qrc_file1}" file1_step1 "${timeformat}")
-file(TIMESTAMP "${qrc_file2}" file2_step1 "${timeformat}")
+ 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()
+ 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}" -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"
-)
+ 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}")
+ file(TIMESTAMP "${qrc_file1}" file1_step2 "${timeformat}")
+ file(TIMESTAMP "${qrc_file2}" file2_step2 "${timeformat}")
+
+ if (NOT file1_step2 STREQUAL file1_step1)
+ 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()
-if (NOT file1_step2 STREQUAL file1_step1)
- 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()
-----------------------------------------------------------------------
Summary of changes:
Tests/QtAutogen/CMakeLists.txt | 127 ++++++++++++++++++++++++----------------
1 file changed, 77 insertions(+), 50 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
