[Cmake-commits] CMake branch, next, updated. v3.1.0-1612-g3a7edea

[Ben Boeckel]

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  3a7edeacb08fdb8f2ab82842b7de528e7f637d36 (commit)
       via  2319702021e7a5f34bdf2a5267d13c779ee75762 (commit)
       via  3777c2c7db091f6cfcaf0b6f2a2c212a4a2a4e36 (commit)
      from  8b355d64de0d1d899a0c58a12285b7514f8d8e18 (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=3a7edeacb08fdb8f2ab82842b7de528e7f637d36
commit 3a7edeacb08fdb8f2ab82842b7de528e7f637d36
Merge: 8b355d6 2319702
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 9 10:43:09 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 9 10:43:09 2015 -0500

    Merge topic 'fix-empty-target-property-queries' into next
    
    23197020 fixup! tests: add tests for querying properties
    3777c2c7 fixup! tests: add tests for querying properties


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2319702021e7a5f34bdf2a5267d13c779ee75762
commit 2319702021e7a5f34bdf2a5267d13c779ee75762
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 9 10:42:50 2015 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Jan 9 10:42:53 2015 -0500

    fixup! tests: add tests for querying properties
    
    Adds testing of get_cmake_property.

diff --git a/Tests/RunCMake/get_property/global_properties-stderr.txt b/Tests/RunCMake/get_property/global_properties-stderr.txt
index b1a2987..4c08ad7 100644
--- a/Tests/RunCMake/get_property/global_properties-stderr.txt
+++ b/Tests/RunCMake/get_property/global_properties-stderr.txt
@@ -1,3 +1,6 @@
-^get_property: --><--
+^get_cmake_property: --><--
+get_property: --><--
+get_cmake_property: -->value<--
 get_property: -->value<--
+get_cmake_property: -->NOTFOUND<--
 get_property: --><--$
diff --git a/Tests/RunCMake/get_property/global_properties.cmake b/Tests/RunCMake/get_property/global_properties.cmake
index 5656a45..2073136 100644
--- a/Tests/RunCMake/get_property/global_properties.cmake
+++ b/Tests/RunCMake/get_property/global_properties.cmake
@@ -1,8 +1,10 @@
 function (check_global_property prop)
+  get_cmake_property(gcp_val "${prop}")
   get_property(gp_val
     GLOBAL
     PROPERTY "${prop}")
 
+  message("get_cmake_property: -->${gcp_val}<--")
   message("get_property: -->${gp_val}<--")
 endfunction ()
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3777c2c7db091f6cfcaf0b6f2a2c212a4a2a4e36
commit 3777c2c7db091f6cfcaf0b6f2a2c212a4a2a4e36
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 9 10:42:27 2015 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Jan 9 10:42:31 2015 -0500

    fixup! tests: add tests for querying properties
    
    Enables and fixes the cache property test.

diff --git a/Tests/RunCMake/get_property/RunCMakeTest.cmake b/Tests/RunCMake/get_property/RunCMakeTest.cmake
index e5700a2..1964824 100644
--- a/Tests/RunCMake/get_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/get_property/RunCMakeTest.cmake
@@ -1,6 +1,6 @@
 include(RunCMake)
 
-#run_cmake(cache_properties)
+run_cmake(cache_properties)
 run_cmake(directory_properties)
 run_cmake(global_properties)
 run_cmake(install_properties)
diff --git a/Tests/RunCMake/get_property/cache_properties-stderr.txt b/Tests/RunCMake/get_property/cache_properties-stderr.txt
index b1a2987..ee019c6 100644
--- a/Tests/RunCMake/get_property/cache_properties-stderr.txt
+++ b/Tests/RunCMake/get_property/cache_properties-stderr.txt
@@ -1,3 +1,3 @@
 ^get_property: --><--
-get_property: -->value<--
+get_property: -->TRUE<--
 get_property: --><--$
diff --git a/Tests/RunCMake/get_property/cache_properties.cmake b/Tests/RunCMake/get_property/cache_properties.cmake
index e41adfd..bf3e7ab 100644
--- a/Tests/RunCMake/get_property/cache_properties.cmake
+++ b/Tests/RunCMake/get_property/cache_properties.cmake
@@ -7,8 +7,9 @@ function (check_cache_property var prop)
 endfunction ()
 
 set(var val CACHE STRING "doc")
-set_property(CACHE var PROPERTY empty "" custom value)
+set_property(CACHE var PROPERTY VALUE "") # empty
+set_property(CACHE var PROPERTY ADVANCED TRUE)
 
-check_cache_property(var empty)
-check_cache_property(var custom)
+check_cache_property(var VALUE)
+check_cache_property(var ADVANCED)
 check_cache_property(var noexist)

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

Summary of changes:
 Tests/RunCMake/get_property/RunCMakeTest.cmake           |    2 +-
 Tests/RunCMake/get_property/cache_properties-stderr.txt  |    2 +-
 Tests/RunCMake/get_property/cache_properties.cmake       |    7 ++++---
 Tests/RunCMake/get_property/global_properties-stderr.txt |    5 ++++-
 Tests/RunCMake/get_property/global_properties.cmake      |    2 ++
 5 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake