[Cmake-commits] CMake branch, next, updated. v2.8.9-1037-gf52c091

[Rolf Eike Beer]

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  f52c0911b7bcfbd06cbe2ff9d2e4276bc520e43f (commit)
       via  2e3210c3c6971b564bcfa1c5ce64fc4cdb9ac820 (commit)
       via  f44453204d795c59f5089a2989d04fc2e4f52644 (commit)
      from  d61f9cb088faa4713245f15c4bfefd204d06c351 (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=f52c0911b7bcfbd06cbe2ff9d2e4276bc520e43f
commit f52c0911b7bcfbd06cbe2ff9d2e4276bc520e43f
Merge: d61f9cb 2e3210c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 8 13:38:39 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 8 13:38:39 2012 -0400

    Merge topic 'start-contributing-irc-session' into next
    
    2e3210c Add several get_property() tests
    f444532 GetProperty test: move doc property tests into main process


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e3210c3c6971b564bcfa1c5ce64fc4cdb9ac820
commit 2e3210c3c6971b564bcfa1c5ce64fc4cdb9ac820
Author:     Petr Kmoch <petr.kmoch at gmail.com>
AuthorDate: Wed Oct 3 17:09:09 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Oct 8 19:38:02 2012 +0200

    Add several get_property() tests
    
    Add tests for some get_property() uses not covered by existing tests.

diff --git a/Tests/CMakeTests/GetPropertyTest.cmake.in b/Tests/CMakeTests/GetPropertyTest.cmake.in
index 7d6e013..306ab72 100644
--- a/Tests/CMakeTests/GetPropertyTest.cmake.in
+++ b/Tests/CMakeTests/GetPropertyTest.cmake.in
@@ -11,6 +11,23 @@ if (NOT FOO_FULL STREQUAL "NOTFOUND")
   message(SEND_ERROR "property FOO has FULL_DOCS set to '${FOO_FULL}'")
 endif ()
 
+get_property(test_brief GLOBAL PROPERTY ENABLED_FEATURES BRIEF_DOCS)
+get_property(test_full GLOBAL PROPERTY ENABLED_FEATURES FULL_DOCS)
+
+if(test_brief STREQUAL "NOTFOUND")
+  message(SEND_ERROR "property ENABLED_FEATURES has no BRIEF_DOCS")
+endif()
+
+if(test_full STREQUAL "NOTFOUND")
+  message(SEND_ERROR "property ENABLED_FEATURES has no FULL_DOCS")
+endif()
+
+set(test_var alpha)
+get_property(result VARIABLE PROPERTY test_var)
+if(NOT result STREQUAL "alpha")
+  message(SEND_ERROR "bad value of VARIABLE PROPERTY test_var: got '${result}' instead of 'alpha'")
+endif()
+
 set(Missing-Argument-RESULT 1)
 set(Missing-Argument-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?GetProperty-Missing-Argument.cmake:1 \\(get_property\\):.*get_property called with incorrect number of arguments.*")
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f44453204d795c59f5089a2989d04fc2e4f52644
commit f44453204d795c59f5089a2989d04fc2e4f52644
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 8 19:31:59 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Oct 8 19:38:02 2012 +0200

    GetProperty test: move doc property tests into main process
    
    They will not raise an error in the normal case so we do not need to run them
    in their own process.

diff --git a/Tests/CMakeTests/GetProperty-Doc-Properties.cmake b/Tests/CMakeTests/GetProperty-Doc-Properties.cmake
deleted file mode 100644
index 6c2c362..0000000
--- a/Tests/CMakeTests/GetProperty-Doc-Properties.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-get_property(FOO_BRIEF GLOBAL PROPERTY FOO BRIEF_DOCS)
-get_property(FOO_FULL GLOBAL PROPERTY FOO FULL_DOCS)
-
-if (NOT FOO_BRIEF STREQUAL "NOTFOUND")
-  message(SEND_ERROR "property FOO has BRIEF_DOCS set to '${FOO_BRIEF}'")
-endif ()
-
-if (NOT FOO_FULL STREQUAL "NOTFOUND")
-  message(SEND_ERROR "property FOO has FULL_DOCS set to '${FOO_FULL}'")
-endif ()
diff --git a/Tests/CMakeTests/GetPropertyTest.cmake.in b/Tests/CMakeTests/GetPropertyTest.cmake.in
index ab96e5b..7d6e013 100644
--- a/Tests/CMakeTests/GetPropertyTest.cmake.in
+++ b/Tests/CMakeTests/GetPropertyTest.cmake.in
@@ -1,5 +1,16 @@
 include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake")
 
+get_property(FOO_BRIEF GLOBAL PROPERTY FOO BRIEF_DOCS)
+get_property(FOO_FULL GLOBAL PROPERTY FOO FULL_DOCS)
+
+if (NOT FOO_BRIEF STREQUAL "NOTFOUND")
+  message(SEND_ERROR "property FOO has BRIEF_DOCS set to '${FOO_BRIEF}'")
+endif ()
+
+if (NOT FOO_FULL STREQUAL "NOTFOUND")
+  message(SEND_ERROR "property FOO has FULL_DOCS set to '${FOO_FULL}'")
+endif ()
+
 set(Missing-Argument-RESULT 1)
 set(Missing-Argument-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?GetProperty-Missing-Argument.cmake:1 \\(get_property\\):.*get_property called with incorrect number of arguments.*")
 
@@ -28,12 +39,6 @@ check_cmake_test(GetProperty
   No-Property
 )
 
-set(Doc-Properties-RESULT 0)
-
-check_cmake_test(GetProperty
-  Doc-Properties
-)
-
 set(Global-Name-RESULT 1)
 set(Global-Name-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?GetProperty-Global-Name.cmake:1 \\(get_property\\):.*get_property given name for GLOBAL scope\\..*")
 

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

Summary of changes:
 Tests/CMakeTests/GetProperty-Doc-Properties.cmake |   10 ------
 Tests/CMakeTests/GetPropertyTest.cmake.in         |   34 +++++++++++++++++----
 2 files changed, 28 insertions(+), 16 deletions(-)
 delete mode 100644 Tests/CMakeTests/GetProperty-Doc-Properties.cmake


hooks/post-receive
-- 
CMake