[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3306-ge98b6a5

[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  e98b6a559beaba092c2f42a127b723c29927b3d3 (commit)
       via  3839acc31a3f2c731225636bae436d9bd185aa1b (commit)
      from  5eabee0bd6ec7632ab9db98e0d71860a0203f88a (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=e98b6a559beaba092c2f42a127b723c29927b3d3
commit e98b6a559beaba092c2f42a127b723c29927b3d3
Merge: 5eabee0 3839acc
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Jul 23 16:44:30 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 23 16:44:30 2013 -0400

    Merge topic 'ninja_bad_cmcldeps_paths' into next
    
    3839acc Add in missing files for the BuildDepends test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3839acc31a3f2c731225636bae436d9bd185aa1b
commit 3839acc31a3f2c731225636bae436d9bd185aa1b
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Jul 23 15:38:34 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue Jul 23 16:26:38 2013 -0400

    Add in missing files for the BuildDepends test.

diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt
index df62fa6..cb4faee 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -126,15 +126,25 @@ 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.h
+  OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dir/header.txt
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+  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
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+  ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
   ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
   )
+
 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
   PROPERTIES GENERATED 1)
+
 add_custom_target(header_tgt DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_executable(ninjadep ninjadep.cpp)
-add_dependencies(ninjadep header_tgt)
\ No newline at end of file
+add_dependencies(ninjadep header_tgt)
diff --git a/Tests/BuildDepends/Project/dir/header.txt b/Tests/BuildDepends/Project/dir/header.txt
new file mode 100644
index 0000000..f2355dc
--- /dev/null
+++ b/Tests/BuildDepends/Project/dir/header.txt
@@ -0,0 +1 @@
+#define HEADER_STRING "ninja"
\ No newline at end of file
diff --git a/Tests/BuildDepends/Project/ninjadep.cpp b/Tests/BuildDepends/Project/ninjadep.cpp
new file mode 100644
index 0000000..8d61336
--- /dev/null
+++ b/Tests/BuildDepends/Project/ninjadep.cpp
@@ -0,0 +1,6 @@
+#include <stdio.h>
+#include "dir/header.h"
+
+int main() {
+  printf("HEADER_STRING: %s\n", HEADER_STRING);
+}

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

Summary of changes:
 Tests/BuildDepends/Project/CMakeLists.txt |   16 +++++++++++++---
 Tests/BuildDepends/Project/dir/header.txt |    1 +
 Tests/BuildDepends/Project/ninjadep.cpp   |    6 ++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 Tests/BuildDepends/Project/dir/header.txt
 create mode 100644 Tests/BuildDepends/Project/ninjadep.cpp


hooks/post-receive
-- 
CMake