diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/add_executable.rst | 2 | ||||
| -rw-r--r-- | Help/command/add_library.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-buildsystem.7.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-generator-expressions.7.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-packages.7.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cpack.1.rst | 2 | ||||
| -rw-r--r-- | Help/prop_dir/INCLUDE_DIRECTORIES.rst | 2 | ||||
| -rw-r--r-- | Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/COMPILE_OPTIONS.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/JOB_POOL_LINK.rst | 2 | ||||
| -rw-r--r-- | Help/release/dev/cpack-rpm-upper-cased-components.rst | 2 | ||||
| -rw-r--r-- | Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst | 2 | ||||
| -rw-r--r-- | Help/variable/CTEST_COVERAGE_COMMAND.rst | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/Help/command/add_executable.rst b/Help/command/add_executable.rst index 8b3fb57..19ca658 100644 --- a/Help/command/add_executable.rst +++ b/Help/command/add_executable.rst @@ -73,7 +73,7 @@ does not appear in the generated buildsystem as a make target. The ``<target>`` may not be an :ref:`Imported Target <Imported Targets>` or an ``ALIAS``. ``ALIAS`` targets can be used as targets to read properties from, executables for custom commands and custom targets. They can also be -tested for existance with the regular :command:`if(TARGET)` subcommand. +tested for existence with the regular :command:`if(TARGET)` subcommand. The ``<name>`` may not be used to modify properties of ``<target>``, that is, it may not be used as the operand of :command:`set_property`, :command:`set_target_properties`, :command:`target_link_libraries` etc. diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst index 5033e18..36adcbe 100644 --- a/Help/command/add_library.rst +++ b/Help/command/add_library.rst @@ -123,7 +123,7 @@ used to refer to ``<target>`` in subsequent commands. The ``<name>`` does not appear in the generatedbuildsystem as a make target. The ``<target>`` may not be an :ref:`Imported Target <Imported Targets>` or an ``ALIAS``. ``ALIAS`` targets can be used as linkable targets and as targets to -read properties from. They can also be tested for existance with the +read properties from. They can also be tested for existence with the regular :command:`if(TARGET)` subcommand. The ``<name>`` may not be used to modify properties of ``<target>``, that is, it may not be used as the operand of :command:`set_property`, :command:`set_target_properties`, diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst index 9004bb2..07bf33f 100644 --- a/Help/manual/cmake-buildsystem.7.rst +++ b/Help/manual/cmake-buildsystem.7.rst @@ -150,7 +150,7 @@ and :prop_tgt:`INTERFACE_COMPILE_OPTIONS` target properties. Each of the commands has a ``PRIVATE``, ``PUBLIC`` and ``INTERFACE`` mode. The ``PRIVATE`` mode populates only the non-``INTERFACE_`` variant of the target property and the ``INTERFACE`` mode populates only the ``INTERFACE_`` variants. -The ``PUBLIC`` mode populates both variants of the repective target property. +The ``PUBLIC`` mode populates both variants of the respective target property. Each command may be invoked with multiple uses of each keyword: .. code-block:: cmake diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 13ee4bd..d4f47dd 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -225,7 +225,7 @@ comparison:: -I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I> generates a string of the entries in the :prop_tgt:`INCLUDE_DIRECTORIES` target -property with each entry preceeded by ``-I``. Note that a more-complete use +property with each entry preceded by ``-I``. Note that a more-complete use in this situation would require first checking if the INCLUDE_DIRECTORIES property is non-empty:: diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index aebc5d9..c27c612 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -645,7 +645,7 @@ Disabling the Package Registry ------------------------------ In some cases using the Package Registries is not desirable. CMake -allows to disable them using the following variables: +allows one to disable them using the following variables: * :variable:`CMAKE_EXPORT_NO_PACKAGE_REGISTRY` disables the :command:`export(PACKAGE)` command. diff --git a/Help/manual/cpack.1.rst b/Help/manual/cpack.1.rst index ba2086e..4f9f28d 100644 --- a/Help/manual/cpack.1.rst +++ b/Help/manual/cpack.1.rst @@ -65,7 +65,7 @@ Options ``-P <package name>`` override/define CPACK_PACKAGE_NAME - If the package name is not specified on cpack commmand line + If the package name is not specified on cpack command line thenCPack.cmake defines it as CMAKE_PROJECT_NAME ``-R <package version>`` diff --git a/Help/prop_dir/INCLUDE_DIRECTORIES.rst b/Help/prop_dir/INCLUDE_DIRECTORIES.rst index baba49b..6789a56 100644 --- a/Help/prop_dir/INCLUDE_DIRECTORIES.rst +++ b/Help/prop_dir/INCLUDE_DIRECTORIES.rst @@ -13,7 +13,7 @@ directories for the compiler. In addition to accepting values from that command, values may be set directly on any directory using the :command:`set_property` command. A directory gets its initial value from its parent directory if it has one. -The intial value of the :prop_tgt:`INCLUDE_DIRECTORIES` target property +The initial value of the :prop_tgt:`INCLUDE_DIRECTORIES` target property comes from the value of this property. Both directory and target property values are adjusted by calls to the :command:`include_directories` command. diff --git a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst index 3db4f18..e8f4d2a 100644 --- a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst +++ b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst @@ -270,7 +270,7 @@ The features known to this version of CMake are: .. _N2442: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm ``cxx_uniform_initialization`` - Uniform intialization, as defined in N2640_. + Uniform initialization, as defined in N2640_. .. _N2640: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2640.pdf diff --git a/Help/prop_tgt/COMPILE_OPTIONS.rst b/Help/prop_tgt/COMPILE_OPTIONS.rst index 36d786a..892ac23 100644 --- a/Help/prop_tgt/COMPILE_OPTIONS.rst +++ b/Help/prop_tgt/COMPILE_OPTIONS.rst @@ -7,7 +7,7 @@ This property holds a :ref:`;-list <CMake Language Lists>` of options specified so far for its target. Use the :command:`target_compile_options` command to append more options. -This property is intialized by the :prop_dir:`COMPILE_OPTIONS` directory +This property is initialized by the :prop_dir:`COMPILE_OPTIONS` directory property when a target is created, and is used by the generators to set the options for the compiler. diff --git a/Help/prop_tgt/JOB_POOL_LINK.rst b/Help/prop_tgt/JOB_POOL_LINK.rst index 716f53f..6535333 100644 --- a/Help/prop_tgt/JOB_POOL_LINK.rst +++ b/Help/prop_tgt/JOB_POOL_LINK.rst @@ -5,7 +5,7 @@ Ninja only: Pool used for linking. The number of parallel link processes could be limited by defining pools with the global :prop_gbl:`JOB_POOLS` -property and then specifing here the pool name. +property and then specifying here the pool name. For instance: diff --git a/Help/release/dev/cpack-rpm-upper-cased-components.rst b/Help/release/dev/cpack-rpm-upper-cased-components.rst index a5fb233..0628170 100644 --- a/Help/release/dev/cpack-rpm-upper-cased-components.rst +++ b/Help/release/dev/cpack-rpm-upper-cased-components.rst @@ -9,7 +9,7 @@ cpack-rpm-upper-cased-components Upper cased component name part in variables is compatible with convention used for other CPack variables. For back compatibility old format of variables is still valid - and prefered if both versions of variable are set, but the + and preferred if both versions of variable are set, but the preferred future use is upper cased component names in variables. New variables that will be added to CPackRPM in later versions will only support upper cased component variable format. diff --git a/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst b/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst index 8bb7cc0..5be935b 100644 --- a/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst +++ b/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst @@ -3,7 +3,7 @@ CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN The external toolchain for cross-compiling, if supported. -Some compiler toolchains do not ship their own auxilliary utilities such as +Some compiler toolchains do not ship their own auxiliary utilities such as archivers and linkers. The compiler driver may support a command-line argument to specify the location of such tools. ``CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN`` may be set to a path to a path to diff --git a/Help/variable/CTEST_COVERAGE_COMMAND.rst b/Help/variable/CTEST_COVERAGE_COMMAND.rst index 0491d42..a78792e 100644 --- a/Help/variable/CTEST_COVERAGE_COMMAND.rst +++ b/Help/variable/CTEST_COVERAGE_COMMAND.rst @@ -54,7 +54,7 @@ program requires some named arguments. file format to write output in: xml or html The rest of the supplied arguments consist of the full paths to the -``/src/main/java`` directories of each module within the souce tree. These +``/src/main/java`` directories of each module within the source tree. These directories are needed and should not be forgotten. .. _`Cobertura`: http://cobertura.github.io/cobertura/ |