[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1267-g85bca2b

[Brad King]

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  85bca2bda5bae6e87441dfb116e5ad9d94ef50ba (commit)
       via  84a423040686fb5855cbe65d4aa4e209dc4ca870 (commit)
      from  a3d62383d61b05ed21cf5f437693cf55ce6cca0a (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=85bca2bda5bae6e87441dfb116e5ad9d94ef50ba
commit 85bca2bda5bae6e87441dfb116e5ad9d94ef50ba
Merge: a3d6238 84a4230
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 20 09:02:49 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 09:02:49 2014 -0400

    Merge topic 'fix-out-of-date-CTestTestMemcheck' into next
    
    84a42304 Tests: Prevent unnecessary rebuilds in CTestTestMemcheck


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84a423040686fb5855cbe65d4aa4e209dc4ca870
commit 84a423040686fb5855cbe65d4aa4e209dc4ca870
Author:     David Cole <DLRdave at aol.com>
AuthorDate: Mon Mar 17 07:32:35 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 20 09:02:50 2014 -0400

    Tests: Prevent unnecessary rebuilds in CTestTestMemcheck
    
    Repeated "cmake . && ninja" calls were resulting in rebuilds every time.
    
    Change the test so that it uses "file(WRITE" to generate a ".in" file and
    then configure_file to "copy if different" that ".in" file to the final
    generated source file.
    
    Now, rebuilds will only occur if there are changes to the generated source
    file on "cmake ." runs after the first one.

diff --git a/Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt b/Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt
index c5aa2cd..47d6a24 100644
--- a/Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt
@@ -1,7 +1,12 @@
 # A dummy checker implementation that does not write the requested output file
 # so it triggers an error for every checker.
 
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/ret0.c" "int main(){return 0;}\n")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/ret0.c.in" "int main(){return 0;}\n")
+
+configure_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/ret0.c.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/ret0.c"
+  )
 
 foreach(_pseudo IN ITEMS valgrind purify BC)
   add_executable(pseudonl_${_pseudo} "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")

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

Summary of changes:


hooks/post-receive
-- 
CMake