summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-02-08 10:35:45 -0500
committerBrad King <brad.king@kitware.com>2016-02-08 10:35:45 -0500
commit024c4eac0502e4153c9eb44a2f5bcabf48c4d00d (patch)
tree798098870c6aadf2efd173e1ecb0dcad0bb5ee13
parent52a81d67f1a462143147e2282c8763b5b37060ae (diff)
parenta3b91d164043bdef713c0490f3069c00851ccf13 (diff)
downloadcmake-024c4eac0502e4153c9eb44a2f5bcabf48c4d00d.tar.gz
Merge branch 'fix-doc-typos' into release
-rw-r--r--Help/command/cmake_minimum_required.rst2
-rw-r--r--Help/manual/cmake-buildsystem.7.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Help/command/cmake_minimum_required.rst b/Help/command/cmake_minimum_required.rst
index 857321817b..dc65a9e680 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
diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 4a04f3145b..9004bb26e3 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"