[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3308-g096f934

[Robert Maynard]

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  096f93491eef96d0bbb25dfd7541aa19aff2118e (commit)
       via  3ac978fa0f5324c220f4b6d7bbedfddbc3c4ae34 (commit)
      from  e98b6a559beaba092c2f42a127b723c29927b3d3 (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=096f93491eef96d0bbb25dfd7541aa19aff2118e
commit 096f93491eef96d0bbb25dfd7541aa19aff2118e
Merge: e98b6a5 3ac978f
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Jul 24 09:30:55 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 24 09:30:55 2013 -0400

    Merge topic 'ninja_bad_cmcldeps_paths' into next
    
    3ac978f BuildDepends: Correct the generation of header.txt.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ac978fa0f5324c220f4b6d7bbedfddbc3c4ae34
commit 3ac978fa0f5324c220f4b6d7bbedfddbc3c4ae34
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Jul 24 09:20:50 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed Jul 24 09:20:50 2013 -0400

    BuildDepends: Correct the generation of header.txt.
    
    Now you can run the test multiple times without having bad state
    propagated from the first run, causing all futures runs to fail.

diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt
index ce0c039..6281c40 100644
--- a/Tests/BuildDepends/CMakeLists.txt
+++ b/Tests/BuildDepends/CMakeLists.txt
@@ -53,6 +53,8 @@ write_file(${BuildDepends_BINARY_DIR}/Project/foo.cxx
 
 file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot.hxx.in
   "static const char* zot = \"zot\";\n")
+file(WRITE ${BuildDepends_BINARY_DIR}/Project/dir/header.txt
+  "#define HEADER_STRING \"ninja\"\n" )
 file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot_custom.hxx.in
   "static const char* zot_custom = \"zot_custom\";\n")
 file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot_macro_dir.hxx
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt
index cb4faee..b4c6a07 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -124,15 +124,6 @@ add_custom_target(link_depends_no_shared_check ALL
   )
 add_dependencies(link_depends_no_shared_check link_depends_no_shared_exe)
 
-# add a test for ninja dep handler
-add_custom_command(
-  OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dir/header.txt
-  COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_CURRENT_SOURCE_DIR}/dir/header.txt
-  ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
-  )
-
 add_custom_command(
   OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
diff --git a/Tests/BuildDepends/Project/dir/header.txt b/Tests/BuildDepends/Project/dir/header.txt
deleted file mode 100644
index f2355dc..0000000
--- a/Tests/BuildDepends/Project/dir/header.txt
+++ /dev/null
@@ -1 +0,0 @@
-#define HEADER_STRING "ninja"
\ No newline at end of file

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

Summary of changes:
 Tests/BuildDepends/CMakeLists.txt         |    2 ++
 Tests/BuildDepends/Project/CMakeLists.txt |    9 ---------
 Tests/BuildDepends/Project/dir/header.txt |    1 -
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 Tests/BuildDepends/Project/dir/header.txt


hooks/post-receive
-- 
CMake