[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-62-gbb332d0

Brad King brad.king at kitware.com
Mon Feb 8 09:59:13 EST 2016


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  bb332d0c3040615fcc0e77f924f193db79913f2b (commit)
       via  a3b91d164043bdef713c0490f3069c00851ccf13 (commit)
       via  d8c90800174b6b5256fea5ea0813977c608c5ff0 (commit)
      from  494b416de52ed4f24eaf69dec91747435e90dbfb (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb332d0c3040615fcc0e77f924f193db79913f2b
commit bb332d0c3040615fcc0e77f924f193db79913f2b
Merge: 494b416 a3b91d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 8 09:59:13 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 8 09:59:13 2016 -0500

    Merge topic 'fix-doc-typos' into next
    
    a3b91d16 Help: Fix command specification for cmake_minimum_required
    d8c90800 Help: Fix mistake in cmake-buildsystem(7) example


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3b91d164043bdef713c0490f3069c00851ccf13
commit a3b91d164043bdef713c0490f3069c00851ccf13
Author:     Horst Kronstorfer <mabuze at aon.at>
AuthorDate: Mon Feb 8 12:55:25 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 8 09:52:56 2016 -0500

    Help: Fix command specification for cmake_minimum_required
    
    Implementation indicates that at least two components of VERSION must
    be specified (see Source/cmCMakeMinimumRequired.cxx.) Therefore the
    minor version is not optional.

diff --git a/Help/command/cmake_minimum_required.rst b/Help/command/cmake_minimum_required.rst
index 8573218..dc65a9e 100644
--- a/Help/command/cmake_minimum_required.rst
+++ b/Help/command/cmake_minimum_required.rst
@@ -5,7 +5,7 @@ Set the minimum required version of cmake for a project.
 
 ::
 
-  cmake_minimum_required(VERSION major[.minor[.patch[.tweak]]]
+  cmake_minimum_required(VERSION major.minor[.patch[.tweak]]
                          [FATAL_ERROR])
 
 If the current version of CMake is lower than that required it will

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8c90800174b6b5256fea5ea0813977c608c5ff0
commit d8c90800174b6b5256fea5ea0813977c608c5ff0
Author:     Paul Wilkinson <paul.wilkinson at cantab.net>
AuthorDate: Sun Feb 7 20:46:27 2016 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 8 09:51:37 2016 -0500

    Help: Fix mistake in cmake-buildsystem(7) example
    
    The COMPATIBLE_INTERFACE_NUMBER_MAX example now sets
    INTERFACE_CONTAINER_SIZE_REQUIRED on lib1Version2 and lib1Version3.
    Previously set it on lib1Version2 twice and never on lib1Version3.

diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 4a04f31..9004bb2 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -427,7 +427,7 @@ specified will be calculated:
   )
 
   add_library(lib1Version3 SHARED lib1_v3.cpp)
-  set_property(TARGET lib1Version2 PROPERTY INTERFACE_CONTAINER_SIZE_REQUIRED 1000)
+  set_property(TARGET lib1Version3 PROPERTY INTERFACE_CONTAINER_SIZE_REQUIRED 1000)
 
   add_executable(exe1 exe1.cpp)
   # CONTAINER_SIZE_REQUIRED will be "200"

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

Summary of changes:
 Help/command/cmake_minimum_required.rst |    2 +-
 Help/manual/cmake-buildsystem.7.rst     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list