Merge branch 'fix-doc-typos' into release

This commit is contained in:
Brad King 2016-02-08 10:35:45 -05:00
commit 024c4eac05
2 changed files with 2 additions and 2 deletions

View File

@ -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]) [FATAL_ERROR])
If the current version of CMake is lower than that required it will If the current version of CMake is lower than that required it will

View File

@ -427,7 +427,7 @@ specified will be calculated:
) )
add_library(lib1Version3 SHARED lib1_v3.cpp) 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) add_executable(exe1 exe1.cpp)
# CONTAINER_SIZE_REQUIRED will be "200" # CONTAINER_SIZE_REQUIRED will be "200"