[Cmake-commits] CMake branch, next, updated. v2.8.11-2443-g5992a34

[Stephen Kelly]

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  5992a3414493745aad2813b714c5ecb81d22dd00 (commit)
       via  f8a440f7f859cd8302d1a4a9365f37e1fa0331fa (commit)
      from  34f314d8ee0bb46b23783719c751053177aabe73 (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=5992a3414493745aad2813b714c5ecb81d22dd00
commit 5992a3414493745aad2813b714c5ecb81d22dd00
Merge: 34f314d f8a440f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 3 12:22:50 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 3 12:22:50 2013 -0400

    Merge topic 'suppress-unused-cli-with-value-in-cache' into next
    
    f8a440f Create a separate project for the WarnUnusedCliUnused test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8a440f7f859cd8302d1a4a9365f37e1fa0331fa
commit f8a440f7f859cd8302d1a4a9365f37e1fa0331fa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 3 18:19:20 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jun 3 18:20:43 2013 +0200

    Create a separate project for the WarnUnusedCliUnused test.
    
    Otherwise it does not get cleaned properly with the IDE generators.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e37c96b..b005dca 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1623,7 +1623,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     # this test. (See #13371)
     add_test(WarnUnusedCliUnused ${CMAKE_CTEST_COMMAND}
       --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/VariableUsage"
+      "${CMake_SOURCE_DIR}/Tests/WarnUnusedCliUnused"
       "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUnused"
       ${build_generator_args}
       --build-project WarnUnusedCliUnused
diff --git a/Tests/WarnUnusedCliUnused/CMakeLists.txt b/Tests/WarnUnusedCliUnused/CMakeLists.txt
new file mode 100644
index 0000000..7ed69bf
--- /dev/null
+++ b/Tests/WarnUnusedCliUnused/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(WarnUnusedCliUnused)
+
+set_directory_properties(PROPERTIES
+  ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_BINARY_DIR}/CMakeCache.txt"
+)
+
+add_library(dummy empty.cpp)
diff --git a/Tests/VariableUsage/empty.cpp b/Tests/WarnUnusedCliUnused/empty.cpp
similarity index 100%
rename from Tests/VariableUsage/empty.cpp
rename to Tests/WarnUnusedCliUnused/empty.cpp

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

Summary of changes:
 Tests/CMakeLists.txt                               |    2 +-
 .../CMakeLists.txt                                 |    2 +-
 .../empty.cpp                                      |    0
 3 files changed, 2 insertions(+), 2 deletions(-)
 copy Tests/{VariableUsage => WarnUnusedCliUnused}/CMakeLists.txt (83%)
 rename Tests/{VariableUsage => WarnUnusedCliUnused}/empty.cpp (100%)


hooks/post-receive
-- 
CMake