[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1763-g9a01fd2

Stephen Kelly steveire at gmail.com
Wed Apr 2 17:12:32 EDT 2014


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  9a01fd200ab366c60110adc3eb72012512246296 (commit)
       via  daa0b6c4b3304ba469feb262c19f9d14ff497b2e (commit)
      from  7873fa67bd78846ffc7b0396c3bf2e1d31adcd60 (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=9a01fd200ab366c60110adc3eb72012512246296
commit 9a01fd200ab366c60110adc3eb72012512246296
Merge: 7873fa6 daa0b6c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 2 17:12:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 2 17:12:32 2014 -0400

    Merge topic 'target-sources-refactor' into next
    
    daa0b6c4 Fix version in policy.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=daa0b6c4b3304ba469feb262c19f9d14ff497b2e
commit daa0b6c4b3304ba469feb262c19f9d14ff497b2e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 2 23:08:32 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 2 23:11:50 2014 +0200

    Fix version in policy.

diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 226d6c6..759df91 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -347,7 +347,7 @@ cmPolicies::cmPolicies()
   this->DefinePolicy(
     CMP0051, "CMP0051",
     "List TARGET_OBJECTS in SOURCES target property.",
-    3,0,0, cmPolicies::WARN);
+    3,1,0, cmPolicies::WARN);
 }
 
 cmPolicies::~cmPolicies()
diff --git a/Tests/RunCMake/CMP0051/CMakeLists.txt b/Tests/RunCMake/CMP0051/CMakeLists.txt
index a06591c..3482e6b 100644
--- a/Tests/RunCMake/CMP0051/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0051/CMakeLists.txt
@@ -1,3 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
 project(${RunCMake_TEST} CXX)
 include(${RunCMake_TEST}.cmake)

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

Summary of changes:
 Source/cmPolicies.cxx                 |    2 +-
 Tests/RunCMake/CMP0051/CMakeLists.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list