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 d20fa54403c2939bd29bfc97a25b745b6b97c078 (commit)
via c13fbf1060cc46f2c249fb806ed8cf838a98b335 (commit)
via 202b7d12eb0609f1a2dd7f587c0ed17d45bec1c5 (commit)
from 65800e99476e54d6cec2151f6873a56676821698 (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=d20fa54403c2939bd29bfc97a25b745b6b97c078
commit d20fa54403c2939bd29bfc97a25b745b6b97c078
Merge: 65800e9 c13fbf1
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Thu Jul 31 05:30:39 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jul 31 05:30:39 2014 -0400
Merge topic 'output-tracking' into next
c13fbf10 Tests: Assert that configure_file() output file regeneration works
202b7d12 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c13fbf1060cc46f2c249fb806ed8cf838a98b335
commit c13fbf1060cc46f2c249fb806ed8cf838a98b335
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Thu Jul 31 11:29:40 2014 +0200
Commit: Nils Gladitz <nilsglad...@gmail.com>
CommitDate: Thu Jul 31 11:29:40 2014 +0200
Tests: Assert that configure_file() output file regeneration works
diff --git a/Tests/RunCMake/configure_file/RunCMakeTest.cmake
b/Tests/RunCMake/configure_file/RunCMakeTest.cmake
index c8bfa57..18f2a31 100644
--- a/Tests/RunCMake/configure_file/RunCMakeTest.cmake
+++ b/Tests/RunCMake/configure_file/RunCMakeTest.cmake
@@ -6,3 +6,4 @@ run_cmake(UTF16LE-BOM)
run_cmake(UTF16BE-BOM)
run_cmake(UTF32LE-BOM)
run_cmake(UTF32BE-BOM)
+run_cmake(regenerate-output)
diff --git a/Tests/RunCMake/configure_file/dummy.in
b/Tests/RunCMake/configure_file/dummy.in
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/configure_file/regenerate-output-check.cmake
b/Tests/RunCMake/configure_file/regenerate-output-check.cmake
new file mode 100644
index 0000000..f263b89
--- /dev/null
+++ b/Tests/RunCMake/configure_file/regenerate-output-check.cmake
@@ -0,0 +1,25 @@
+set(DUMMY_OUT ${RunCMake_TEST_BINARY_DIR}/dummy.out)
+
+if(NOT EXISTS ${DUMMY_OUT})
+ message(FATAL_ERROR "dummy.out should have been generated
[${CMAKE_CURRENT_BINARY_DIR}]")
+endif()
+
+file(REMOVE ${DUMMY_OUT})
+
+if(EXISTS ${DUMMY_OUT})
+ message(FATAL_ERROR "dummy.out should have been removed")
+endif()
+
+execute_process(COMMAND ${CMAKE_COMMAND} --build ${RunCMake_TEST_BINARY_DIR}
+ RESULT_VARIABLE RESULT
+ ERROR_VARIABLE ERROR
+)
+
+if(NOT RESULT STREQUAL "0")
+ message(FATAL_ERROR
+ "implicitly rerunning cmake failed [${RESULT}] [${ERROR}]")
+endif()
+
+if(NOT EXISTS ${DUMMY_OUT})
+ message(FATAL_ERROR "dummy.out should have been re-generated")
+endif()
diff --git a/Tests/RunCMake/configure_file/regenerate-output.cmake
b/Tests/RunCMake/configure_file/regenerate-output.cmake
new file mode 100644
index 0000000..3950099
--- /dev/null
+++ b/Tests/RunCMake/configure_file/regenerate-output.cmake
@@ -0,0 +1 @@
+configure_file(dummy.in dummy.out)
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Tests/RunCMake/configure_file/RunCMakeTest.cmake | 1 +
.../RunCMake/configure_file/dummy.in | 0
.../configure_file/regenerate-output-check.cmake | 25 ++++++++++++++++++++
.../configure_file/regenerate-output.cmake | 1 +
5 files changed, 28 insertions(+), 1 deletion(-)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/configure_file/dummy.in (100%)
create mode 100644 Tests/RunCMake/configure_file/regenerate-output-check.cmake
create mode 100644 Tests/RunCMake/configure_file/regenerate-output.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
