[Cmake-commits] CMake branch, next, updated. v3.0.0-4674-g7a0cbad

[Nils Gladitz]

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  7a0cbad6592c18163a012a32089a618f9632c223 (commit)
       via  89345908d9a618d47f974cdf86dcf29e53023a35 (commit)
      from  ec7470df55bd5744264bb4f810d46ff085369084 (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=7a0cbad6592c18163a012a32089a618f9632c223
commit 7a0cbad6592c18163a012a32089a618f9632c223
Merge: ec7470d 8934590
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jul 31 09:26:55 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 31 09:26:55 2014 -0400

    Merge topic 'output-tracking' into next
    
    89345908 Revert "Tests: Assert that configure_file() output file regeneration works"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89345908d9a618d47f974cdf86dcf29e53023a35
commit 89345908d9a618d47f974cdf86dcf29e53023a35
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jul 31 15:25:41 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Jul 31 15:25:41 2014 +0200

    Revert "Tests: Assert that configure_file() output file regeneration works"
    
    This reverts commit c13fbf1060cc46f2c249fb806ed8cf838a98b335.

diff --git a/Tests/RunCMake/configure_file/RunCMakeTest.cmake b/Tests/RunCMake/configure_file/RunCMakeTest.cmake
index 18f2a31..c8bfa57 100644
--- a/Tests/RunCMake/configure_file/RunCMakeTest.cmake
+++ b/Tests/RunCMake/configure_file/RunCMakeTest.cmake
@@ -6,4 +6,3 @@ 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
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/configure_file/regenerate-output-check.cmake b/Tests/RunCMake/configure_file/regenerate-output-check.cmake
deleted file mode 100644
index f263b89..0000000
--- a/Tests/RunCMake/configure_file/regenerate-output-check.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 3950099..0000000
--- a/Tests/RunCMake/configure_file/regenerate-output.cmake
+++ /dev/null
@@ -1 +0,0 @@
-configure_file(dummy.in dummy.out)

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

Summary of changes:
 Tests/RunCMake/configure_file/RunCMakeTest.cmake   |    1 -
 .../configure_file/regenerate-output-check.cmake   |   25 --------------------
 .../configure_file/regenerate-output.cmake         |    1 -
 3 files changed, 27 deletions(-)
 delete mode 100644 Tests/RunCMake/configure_file/dummy.in
 delete mode 100644 Tests/RunCMake/configure_file/regenerate-output-check.cmake
 delete mode 100644 Tests/RunCMake/configure_file/regenerate-output.cmake


hooks/post-receive
-- 
CMake