[Cmake-commits] CMake branch, next, updated. v2.8.12-3757-g16b0cc2

[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  16b0cc21c3cc2bd4d541d5496d7e431734e58795 (commit)
       via  eedb98d91ed93280f0185e9934a29ae25c0a991b (commit)
      from  9037e1978dcf9565faaed1d25da17e2fcd62137e (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=16b0cc21c3cc2bd4d541d5496d7e431734e58795
commit 16b0cc21c3cc2bd4d541d5496d7e431734e58795
Merge: 9037e19 eedb98d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 10 09:51:26 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 10 09:51:26 2013 -0400

    Merge topic 'target-LOCATION-policy' into next
    
    eedb98d Add if(POLICY)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eedb98d91ed93280f0185e9934a29ae25c0a991b
commit eedb98d91ed93280f0185e9934a29ae25c0a991b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 10 15:50:53 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 10 15:50:53 2013 +0200

    Add if(POLICY)

diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index 2a669b6..cdadcb9 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -24,7 +24,9 @@ if(UNIX  AND  "${CMAKE_GENERATOR}" MATCHES "Makefile")
         CONTENT "CMAKE = \"$<TARGET_FILE:cmake>\"\n"
       )
     else()
-      cmake_policy(SET CMP0026 OLD)
+      if(POLICY CMP0026)
+        cmake_policy(SET CMP0026 OLD)
+      endif()
       get_target_property(cmakeLocation cmake LOCATION)
       file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
         "CMAKE = \"${cmakeLocation}\"\n"

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

Summary of changes:
 Tests/FindPackageModeMakefileTest/CMakeLists.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake