diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/find_package.rst | 2 | ||||
| -rw-r--r-- | Help/command/install.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-server.7.rst | 2 | ||||
| -rw-r--r-- | Help/policy/CMP0037.rst | 2 | ||||
| -rw-r--r-- | Help/release/dev/cpack-rpm-check-executable-flags.rst | 2 | ||||
| -rw-r--r-- | Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 83f4716..b2e70f2 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -176,7 +176,7 @@ claim compatibility with the version requested it is unspecified which one is chosen: unless the variable :variable:`CMAKE_FIND_PACKAGE_SORT_ORDER` is set no attempt is made to choose a highest or closest version number. -To control the order in which ``find_package`` checks for compatibiliy use +To control the order in which ``find_package`` checks for compatibility use the two variables :variable:`CMAKE_FIND_PACKAGE_SORT_ORDER` and :variable:`CMAKE_FIND_PACKAGE_SORT_DIRECTION`. For instance in order to select the highest version one can set:: diff --git a/Help/command/install.rst b/Help/command/install.rst index 9f9ee13..f43b2a0 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -347,7 +347,7 @@ included in the export but a target to which it links is not included the behavior is unspecified. In addition to cmake language files, the ``EXPORT_ANDROID_MK`` option maybe -used to specifiy an export to the android ndk build system. The Android +used to specify an export to the android ndk build system. The Android NDK supports the use of prebuilt libraries, both static and shared. This allows cmake to build the libraries of a project and make them available to an ndk build system complete with transitive dependencies, include flags diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst index 28171c6..1ddcb1b 100644 --- a/Help/manual/cmake-server.7.rst +++ b/Help/manual/cmake-server.7.rst @@ -162,7 +162,7 @@ When the server is busy for a long time, it is polite to send back replies of type "progress" to the client. These will contain a "progressMessage" with a string describing the action currently taking place as well as "progressMinimum", "progressMaximum" and "progressCurrent" with integer values -describing the range of progess. +describing the range of progress. Messages of type "progress" will be followed by more "progress" messages or with a message of type "reply" or "error" that complete the request. diff --git a/Help/policy/CMP0037.rst b/Help/policy/CMP0037.rst index 8041960..d1afeb7 100644 --- a/Help/policy/CMP0037.rst +++ b/Help/policy/CMP0037.rst @@ -11,7 +11,7 @@ diagnostics expect target names to match a restricted pattern. Target names may contain upper and lower case letters, numbers, the underscore character (_), dot(.), plus(+) and minus(-). As a special case, ALIAS -targets and IMPORTED targets may contain two consequtive colons. +targets and IMPORTED targets may contain two consecutive colons. Target names reserved by one or more CMake generators are not allowed. Among others these include "all", "clean", "help", and "install". diff --git a/Help/release/dev/cpack-rpm-check-executable-flags.rst b/Help/release/dev/cpack-rpm-check-executable-flags.rst index 30475d6..5221417 100644 --- a/Help/release/dev/cpack-rpm-check-executable-flags.rst +++ b/Help/release/dev/cpack-rpm-check-executable-flags.rst @@ -2,5 +2,5 @@ cpack-rpm-check-executable-flags -------------------------------- * The :module:`CPackRPM` module learned to enable enforcing of execute - privilages on programs and shared libraries. + privileges on programs and shared libraries. See :variable:`CPACK_RPM_INSTALL_WITH_EXEC` variable. diff --git a/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst b/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst index ba9df5a..5ca40a3 100644 --- a/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst +++ b/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst @@ -2,5 +2,5 @@ CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE ------------------------------------ A CMake language file or module to be included by the :command:`project` -command. This is is intended for injecting custom code into project +command. This is intended for injecting custom code into project builds without modifying their source. |