[Cmake-commits] CMake branch, next, updated. v2.8.10.1-973-g1b481a0

[David Cole]

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  1b481a0a3438c8a46a32e8c5be8504f1c32a193d (commit)
       via  078e35defbe6e0ee3b216dd2e83ca85d49920fc3 (commit)
       via  b336d9a0498abefb01b080eaf613bf79cfaefb6e (commit)
      from  cff920ff84e0c625804ee7b8c309cedb5cc2c69e (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=1b481a0a3438c8a46a32e8c5be8504f1c32a193d
commit 1b481a0a3438c8a46a32e8c5be8504f1c32a193d
Merge: cff920f 078e35d
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Nov 21 11:56:20 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 21 11:56:20 2012 -0500

    Merge topic 'fix-13392-nmake-empty-depends-problem' into next
    
    078e35d NMake: Add a test to demonstrate EmptyDepends issue (#13392)
    b336d9a CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=078e35defbe6e0ee3b216dd2e83ca85d49920fc3
commit 078e35defbe6e0ee3b216dd2e83ca85d49920fc3
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Nov 21 10:23:17 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Nov 21 11:29:10 2012 -0500

    NMake: Add a test to demonstrate EmptyDepends issue (#13392)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f2a198c..7dc2643 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -573,6 +573,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     )
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/CustomCommand")
 
+  ADD_TEST_MACRO(EmptyDepends ${CMAKE_CTEST_COMMAND})
+
   add_test(CustomCommandWorkingDirectory  ${CMAKE_CTEST_COMMAND}
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/CustomCommandWorkingDirectory"
diff --git a/Tests/EmptyDepends/CMakeLists.txt b/Tests/EmptyDepends/CMakeLists.txt
new file mode 100644
index 0000000..a24382c
--- /dev/null
+++ b/Tests/EmptyDepends/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8)
+project(EmptyDepends)
+
+include(CTest)
+
+set(extra_dep)
+
+add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/qrc_my.cxx
+  COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_BINARY_DIR}/qrc_my.cxx"
+  DEPENDS "${extra_dep}" "${CMAKE_BINARY_DIR}/my.qrc")
+
+add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/my.qrc
+  COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/my.qrc)
+
+add_library(qrc SHARED ${CMAKE_BINARY_DIR}/qrc_my.cxx)

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

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Tests/CMakeLists.txt              |    2 ++
 Tests/EmptyDepends/CMakeLists.txt |   15 +++++++++++++++
 3 files changed, 18 insertions(+), 1 deletions(-)
 create mode 100644 Tests/EmptyDepends/CMakeLists.txt


hooks/post-receive
-- 
CMake