kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-spelling-typos' 

49e82c15 Fix spelling typos in comments and documentation (#16037)
This commit is contained in:
Brad King 2016-03-31 08:46:03 -04:00 committed by CMake Topic Stage
parent dea0b6b718 49e82c15d5
commit 0aa736e625
51 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Help/command/add_executable.rst
View File

@ -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 ``<target>`` may not be an :ref:`Imported Target <Imported Targets>` or an
``ALIAS``. ``ALIAS`` targets can be used as targets to read properties ``ALIAS``. ``ALIAS`` targets can be used as targets to read properties
from, executables for custom commands and custom targets. They can also be 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 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`, is, it may not be used as the operand of :command:`set_property`,
:command:`set_target_properties`, :command:`target_link_libraries` etc. :command:`set_target_properties`, :command:`target_link_libraries` etc.

2
Help/command/add_library.rst
View File

@ -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>`` not appear in the generatedbuildsystem as a make target. The ``<target>``
may not be an :ref:`Imported Target <Imported Targets>` or an ``ALIAS``. may not be an :ref:`Imported Target <Imported Targets>` or an ``ALIAS``.
``ALIAS`` targets can be used as linkable targets and as targets to ``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 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 to modify properties of ``<target>``, that is, it may not be used as the
operand of :command:`set_property`, :command:`set_target_properties`, operand of :command:`set_property`, :command:`set_target_properties`,

2
Help/manual/cmake-buildsystem.7.rst
View File

@ -150,7 +150,7 @@ and :prop_tgt:`INTERFACE_COMPILE_OPTIONS` target properties.
Each of the commands has a ``PRIVATE``, ``PUBLIC`` and ``INTERFACE`` mode. The Each of the commands has a ``PRIVATE``, ``PUBLIC`` and ``INTERFACE`` mode. The
``PRIVATE`` mode populates only the non-``INTERFACE_`` variant of the target ``PRIVATE`` mode populates only the non-``INTERFACE_`` variant of the target
property and the ``INTERFACE`` mode populates only the ``INTERFACE_`` variants. 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: Each command may be invoked with multiple uses of each keyword:
.. code-block:: cmake .. code-block:: cmake

2
Help/manual/cmake-generator-expressions.7.rst
View File

@ -225,7 +225,7 @@ comparison::
-I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I> -I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I>
generates a string of the entries in the :prop_tgt:`INCLUDE_DIRECTORIES` target 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 in this situation would require first checking if the INCLUDE_DIRECTORIES
property is non-empty:: property is non-empty::

2
Help/manual/cmake-packages.7.rst
View File

@ -645,7 +645,7 @@ Disabling the Package Registry
------------------------------ ------------------------------
In some cases using the Package Registries is not desirable. CMake 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 * :variable:`CMAKE_EXPORT_NO_PACKAGE_REGISTRY` disables the
:command:`export(PACKAGE)` command. :command:`export(PACKAGE)` command.

2
Help/manual/cpack.1.rst
View File

@ -65,7 +65,7 @@ Options
``-P <package name>`` ``-P <package name>``
override/define CPACK_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 thenCPack.cmake defines it as CMAKE_PROJECT_NAME
``-R <package version>`` ``-R <package version>``

2
Help/prop_dir/INCLUDE_DIRECTORIES.rst
View File

@ -13,7 +13,7 @@ directories for the compiler.
In addition to accepting values from that command, values may be set In addition to accepting values from that command, values may be set
directly on any directory using the :command:`set_property` command. A directly on any directory using the :command:`set_property` command. A
directory gets its initial value from its parent directory if it has one. 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 comes from the value of this property. Both directory and target property
values are adjusted by calls to the :command:`include_directories` command. values are adjusted by calls to the :command:`include_directories` command.

2
Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
View File

@ -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 .. _N2442: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm
``cxx_uniform_initialization`` ``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 .. _N2640: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2640.pdf

2
Help/prop_tgt/COMPILE_OPTIONS.rst
View File

@ -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` specified so far for its target. Use the :command:`target_compile_options`
command to append more 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 property when a target is created, and is used by the generators to set
the options for the compiler. the options for the compiler.

2
Help/prop_tgt/JOB_POOL_LINK.rst
View File

@ -5,7 +5,7 @@ Ninja only: Pool used for linking.
The number of parallel link processes could be limited by defining The number of parallel link processes could be limited by defining
pools with the global :prop_gbl:`JOB_POOLS` 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: For instance:

2
Help/release/dev/cpack-rpm-upper-cased-components.rst
View File

@ -9,7 +9,7 @@ cpack-rpm-upper-cased-components
Upper cased component name part in variables is compatible Upper cased component name part in variables is compatible
with convention used for other CPack variables. with convention used for other CPack variables.
For back compatibility old format of variables is still valid 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. preferred future use is upper cased component names in variables.
New variables that will be added to CPackRPM in later versions New variables that will be added to CPackRPM in later versions
will only support upper cased component variable format. will only support upper cased component variable format.

2
Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
View File

@ -3,7 +3,7 @@ CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN
The external toolchain for cross-compiling, if supported. 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 archivers and linkers. The compiler driver may support a command-line argument
to specify the location of such tools. to specify the location of such tools.
``CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN`` may be set to a path to a path to ``CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN`` may be set to a path to a path to

2
Help/variable/CTEST_COVERAGE_COMMAND.rst
View File

@ -54,7 +54,7 @@ program requires some named arguments.
file format to write output in: xml or html file format to write output in: xml or html
The rest of the supplied arguments consist of the full paths to the 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. directories are needed and should not be forgotten.
.. _`Cobertura`: http://cobertura.github.io/cobertura/ .. _`Cobertura`: http://cobertura.github.io/cobertura/

8
Modules/CMakeVerifyManifest.cmake
View File

@ -6,18 +6,18 @@
# #
# CMakeVerifyManifest.cmake # CMakeVerifyManifest.cmake
# #
# This script is used to verify that embeded manifests and side by side # This script is used to verify that embedded manifests and side by side
# manifests for a project match. To run this script, cd to a directory # manifests for a project match. To run this script, cd to a directory
# and run the script with cmake -P. On the command line you can pass in # and run the script with cmake -P. On the command line you can pass in
# versions that are OK even if not found in the .manifest files. For # versions that are OK even if not found in the .manifest files. For
# example, cmake -Dallow_versions=8.0.50608.0 # example, cmake -Dallow_versions=8.0.50608.0
# -PCmakeVerifyManifest.cmake could be used to allow an embeded manifest # -PCmakeVerifyManifest.cmake could be used to allow an embedded manifest
# of 8.0.50608.0 to be used in a project even if that version was not # of 8.0.50608.0 to be used in a project even if that version was not
# found in the .manifest file. # found in the .manifest file.
# This script first recursively globs *.manifest files from # This script first recursively globs *.manifest files from
# the current directory. Then globs *.exe and *.dll. Each # the current directory. Then globs *.exe and *.dll. Each
# .exe and .dll is scanned for embeded manifests and the versions # .exe and .dll is scanned for embedded manifests and the versions
# of CRT are compared to those found in the .manifest files # of CRT are compared to those found in the .manifest files
# from the first glob. # from the first glob.
@ -54,7 +54,7 @@ function(crt_version file list_var)
endif() endif()
endforeach() endforeach()
if(NOT DEFINED has_match) if(NOT DEFINED has_match)
message("Information: no embeded manifest in: ${file}") message("Information: no embedded manifest in: ${file}")
return() return()
endif() endif()
list(APPEND version_list ${${list_var}}) list(APPEND version_list ${${list_var}})

2
Modules/CPackRPM.cmake
View File

@ -23,7 +23,7 @@
# #
# .. note:: # .. note::
# #
# `<COMPONENT>` part of variables is prefered to be in upper case (for e.g. if # `<COMPONENT>` part of variables is preferred to be in upper case (for e.g. if
# component is named `foo` then use `CPACK_RPM_FOO_XXXX` variable name format) # component is named `foo` then use `CPACK_RPM_FOO_XXXX` variable name format)
# as is with other `CPACK_<COMPONENT>_XXXX` variables. # as is with other `CPACK_<COMPONENT>_XXXX` variables.
# For the purposes of back compatibility (CMake/CPack version 3.5 and lower) # For the purposes of back compatibility (CMake/CPack version 3.5 and lower)

6
Modules/ExternalProject.cmake
View File

@ -116,7 +116,7 @@ Create custom targets to build projects in external trees
``CMAKE_CACHE_ARGS <arg>...`` ``CMAKE_CACHE_ARGS <arg>...``
Initial cache arguments, of the form ``-Dvar:string=on``. Initial cache arguments, of the form ``-Dvar:string=on``.
These arguments are written in a pre-load a script that populates These arguments are written in a pre-load a script that populates
CMake cache, see also :manual:`cmake -C <cmake(1)>`. This allows to CMake cache, see also :manual:`cmake -C <cmake(1)>`. This allows one to
overcome command line length limits. overcome command line length limits.
These arguments are :command:`set` using the ``FORCE`` argument, These arguments are :command:`set` using the ``FORCE`` argument,
and therefore cannot be changed by the user. and therefore cannot be changed by the user.
@ -125,7 +125,7 @@ Create custom targets to build projects in external trees
``CMAKE_CACHE_DEFAULT_ARGS <arg>...`` ``CMAKE_CACHE_DEFAULT_ARGS <arg>...``
Initial default cache arguments, of the form ``-Dvar:string=on``. Initial default cache arguments, of the form ``-Dvar:string=on``.
These arguments are written in a pre-load a script that populates These arguments are written in a pre-load a script that populates
CMake cache, see also :manual:`cmake -C <cmake(1)>`. This allows to CMake cache, see also :manual:`cmake -C <cmake(1)>`. This allows one to
overcome command line length limits. overcome command line length limits.
These arguments can be used as default value that will be set if no These arguments can be used as default value that will be set if no
previous value is found in the cache, and that the user can change previous value is found in the cache, and that the user can change
@ -241,7 +241,7 @@ Create custom targets to build projects in external trees
If ``UPDATE_DISCONNECTED`` is set, the update step is not executed If ``UPDATE_DISCONNECTED`` is set, the update step is not executed
automatically when building the main target. The update step can still automatically when building the main target. The update step can still
be added as a step target and called manually. This is useful if you be added as a step target and called manually. This is useful if you
want to allow to build the project when you are disconnected from the want to allow one to build the project when you are disconnected from the
network (you might still need the network for the download step). network (you might still need the network for the download step).
This is disabled by default. This is disabled by default.
The directory property ``EP_UPDATE_DISCONNECTED`` can be used to change The directory property ``EP_UPDATE_DISCONNECTED`` can be used to change

4
Modules/FindCUDA.cmake
View File

@ -81,7 +81,7 @@
# --compiler-bindir is already present in the CUDA_NVCC_FLAGS or # --compiler-bindir is already present in the CUDA_NVCC_FLAGS or
# CUDA_NVCC_FLAGS_<CONFIG> variables. For Visual Studio targets # CUDA_NVCC_FLAGS_<CONFIG> variables. For Visual Studio targets
# $(VCInstallDir)/bin is a special value that expands out to the path when # $(VCInstallDir)/bin is a special value that expands out to the path when
# the command is run from withing VS. # the command is run from within VS.
# #
# CUDA_NVCC_FLAGS # CUDA_NVCC_FLAGS
# CUDA_NVCC_FLAGS_<CONFIG> # CUDA_NVCC_FLAGS_<CONFIG>
@ -215,7 +215,7 @@
# The arguments passed in after OPTIONS are extra command line options to # The arguments passed in after OPTIONS are extra command line options to
# give to nvcc. You can also specify per configuration options by # give to nvcc. You can also specify per configuration options by
# specifying the name of the configuration followed by the options. General # specifying the name of the configuration followed by the options. General
# options must preceed configuration specific options. Not all # options must precede configuration specific options. Not all
# configurations need to be specified, only the ones provided will be used. # configurations need to be specified, only the ones provided will be used.
# #
# OPTIONS -DFLAG=2 "-DFLAG_OTHER=space in flag" # OPTIONS -DFLAG=2 "-DFLAG_OTHER=space in flag"

2
Modules/FindJava.cmake
View File

@ -26,7 +26,7 @@
# Java_JAVA_EXECUTABLE = the full path to the Java runtime # Java_JAVA_EXECUTABLE = the full path to the Java runtime
# Java_JAVAC_EXECUTABLE = the full path to the Java compiler # Java_JAVAC_EXECUTABLE = the full path to the Java compiler
# Java_JAVAH_EXECUTABLE = the full path to the Java header generator # Java_JAVAH_EXECUTABLE = the full path to the Java header generator
# Java_JAVADOC_EXECUTABLE = the full path to the Java documention generator # Java_JAVADOC_EXECUTABLE = the full path to the Java documentation generator
# Java_IDLJ_EXECUTABLE = the full path to the Java idl compiler # Java_IDLJ_EXECUTABLE = the full path to the Java idl compiler
# Java_JAR_EXECUTABLE = the full path to the Java archiver # Java_JAR_EXECUTABLE = the full path to the Java archiver
# Java_JARSIGNER_EXECUTABLE = the full path to the Java jar signer # Java_JARSIGNER_EXECUTABLE = the full path to the Java jar signer

2
Modules/FindMatlab.cmake
View File

@ -132,7 +132,7 @@
# useful for the searching all possible Matlab installation. # useful for the searching all possible Matlab installation.
# :command:`matlab_get_mex_suffix` # :command:`matlab_get_mex_suffix`
# returns the suffix to be used for the mex files # returns the suffix to be used for the mex files
# (platform/architecture dependant) # (platform/architecture dependent)
# :command:`matlab_get_version_from_matlab_run` # :command:`matlab_get_version_from_matlab_run`
# returns the version of Matlab, given the full directory of the Matlab # returns the version of Matlab, given the full directory of the Matlab
# program. # program.

4
Modules/FindPNG.cmake
View File

@ -85,7 +85,7 @@ if(ZLIB_FOUND)
list(APPEND PNG_NAMES_DEBUG png${v}d libpng${v}d) list(APPEND PNG_NAMES_DEBUG png${v}d libpng${v}d)
endforeach() endforeach()
unset(_PNG_VERSION_SUFFIXES) unset(_PNG_VERSION_SUFFIXES)
# For compatiblity with versions prior to this multi-config search, honor # For compatibility with versions prior to this multi-config search, honor
# any PNG_LIBRARY that is already specified and skip the search. # any PNG_LIBRARY that is already specified and skip the search.
if(NOT PNG_LIBRARY) if(NOT PNG_LIBRARY)
find_library(PNG_LIBRARY_RELEASE NAMES ${PNG_NAMES}) find_library(PNG_LIBRARY_RELEASE NAMES ${PNG_NAMES})
@ -104,7 +104,7 @@ if(ZLIB_FOUND)
if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR) if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
# png.h includes zlib.h. Sigh. # png.h includes zlib.h. Sigh.
set(PNG_INCLUDE_DIRS ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) set(PNG_INCLUDE_DIRS ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
set(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS} ) # for backward compatiblity set(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS} ) # for backward compatibility
set(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY}) set(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY})
if (CYGWIN) if (CYGWIN)

4
Modules/FindSDL_image.cmake
View File

@ -16,7 +16,7 @@
# #
# #
# #
# For backward compatiblity the following variables are also set: # For backward compatibility the following variables are also set:
# #
# :: # ::
# #
@ -103,7 +103,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_image
REQUIRED_VARS SDL_IMAGE_LIBRARIES SDL_IMAGE_INCLUDE_DIRS REQUIRED_VARS SDL_IMAGE_LIBRARIES SDL_IMAGE_INCLUDE_DIRS
VERSION_VAR SDL_IMAGE_VERSION_STRING) VERSION_VAR SDL_IMAGE_VERSION_STRING)
# for backward compatiblity # for backward compatibility
set(SDLIMAGE_LIBRARY ${SDL_IMAGE_LIBRARIES}) set(SDLIMAGE_LIBRARY ${SDL_IMAGE_LIBRARIES})
set(SDLIMAGE_INCLUDE_DIR ${SDL_IMAGE_INCLUDE_DIRS}) set(SDLIMAGE_INCLUDE_DIR ${SDL_IMAGE_INCLUDE_DIRS})
set(SDLIMAGE_FOUND ${SDL_IMAGE_FOUND}) set(SDLIMAGE_FOUND ${SDL_IMAGE_FOUND})

4
Modules/FindSDL_mixer.cmake
View File

@ -16,7 +16,7 @@
# #
# #
# #
# For backward compatiblity the following variables are also set: # For backward compatibility the following variables are also set:
# #
# :: # ::
# #
@ -103,7 +103,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_mixer
REQUIRED_VARS SDL_MIXER_LIBRARIES SDL_MIXER_INCLUDE_DIRS REQUIRED_VARS SDL_MIXER_LIBRARIES SDL_MIXER_INCLUDE_DIRS
VERSION_VAR SDL_MIXER_VERSION_STRING) VERSION_VAR SDL_MIXER_VERSION_STRING)
# for backward compatiblity # for backward compatibility
set(SDLMIXER_LIBRARY ${SDL_MIXER_LIBRARIES}) set(SDLMIXER_LIBRARY ${SDL_MIXER_LIBRARIES})
set(SDLMIXER_INCLUDE_DIR ${SDL_MIXER_INCLUDE_DIRS}) set(SDLMIXER_INCLUDE_DIR ${SDL_MIXER_INCLUDE_DIRS})
set(SDLMIXER_FOUND ${SDL_MIXER_FOUND}) set(SDLMIXER_FOUND ${SDL_MIXER_FOUND})

4
Modules/FindSDL_net.cmake
View File

@ -15,7 +15,7 @@
# #
# #
# #
# For backward compatiblity the following variables are also set: # For backward compatibility the following variables are also set:
# #
# :: # ::
# #
@ -102,7 +102,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_net
REQUIRED_VARS SDL_NET_LIBRARIES SDL_NET_INCLUDE_DIRS REQUIRED_VARS SDL_NET_LIBRARIES SDL_NET_INCLUDE_DIRS
VERSION_VAR SDL_NET_VERSION_STRING) VERSION_VAR SDL_NET_VERSION_STRING)
# for backward compatiblity # for backward compatibility
set(SDLNET_LIBRARY ${SDL_NET_LIBRARIES}) set(SDLNET_LIBRARY ${SDL_NET_LIBRARIES})
set(SDLNET_INCLUDE_DIR ${SDL_NET_INCLUDE_DIRS}) set(SDLNET_INCLUDE_DIR ${SDL_NET_INCLUDE_DIRS})
set(SDLNET_FOUND ${SDL_NET_FOUND}) set(SDLNET_FOUND ${SDL_NET_FOUND})

4
Modules/FindSDL_ttf.cmake
View File

@ -15,7 +15,7 @@
# #
# #
# #
# For backward compatiblity the following variables are also set: # For backward compatibility the following variables are also set:
# #
# :: # ::
# #
@ -102,7 +102,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_ttf
REQUIRED_VARS SDL_TTF_LIBRARIES SDL_TTF_INCLUDE_DIRS REQUIRED_VARS SDL_TTF_LIBRARIES SDL_TTF_INCLUDE_DIRS
VERSION_VAR SDL_TTF_VERSION_STRING) VERSION_VAR SDL_TTF_VERSION_STRING)
# for backward compatiblity # for backward compatibility
set(SDLTTF_LIBRARY ${SDL_TTF_LIBRARIES}) set(SDLTTF_LIBRARY ${SDL_TTF_LIBRARIES})
set(SDLTTF_INCLUDE_DIR ${SDL_TTF_INCLUDE_DIRS}) set(SDLTTF_INCLUDE_DIR ${SDL_TTF_INCLUDE_DIRS})
set(SDLTTF_FOUND ${SDL_TTF_FOUND}) set(SDLTTF_FOUND ${SDL_TTF_FOUND})

2
Modules/FindSubversion.cmake
View File

@ -11,7 +11,7 @@
# Subversion_SVN_EXECUTABLE - path to svn command line client # Subversion_SVN_EXECUTABLE - path to svn command line client
# Subversion_VERSION_SVN - version of svn command line client # Subversion_VERSION_SVN - version of svn command line client
# Subversion_FOUND - true if the command line client was found # Subversion_FOUND - true if the command line client was found
# SUBVERSION_FOUND - same as Subversion_FOUND, set for compatiblity reasons # SUBVERSION_FOUND - same as Subversion_FOUND, set for compatibility reasons
# #
# #
# #

2
Modules/FindThreads.cmake
View File

@ -26,7 +26,7 @@
# #
# CMAKE_THREAD_PREFER_PTHREAD # CMAKE_THREAD_PREFER_PTHREAD
# #
# If the use of the -pthread compiler and linker flag is prefered then the # If the use of the -pthread compiler and linker flag is preferred then the
# caller can set # caller can set
# #
# :: # ::

2
Modules/Platform/GHS-MULTI-Initialize.cmake
View File

@ -15,7 +15,7 @@
#Setup Greenhills MULTI specific compilation information #Setup Greenhills MULTI specific compilation information
if (NOT GHS_INT_DIRECTORY) if (NOT GHS_INT_DIRECTORY)
#Assume the C:/ghs/int#### directory that is latest is prefered #Assume the C:/ghs/int#### directory that is latest is preferred
set(GHS_EXPECTED_ROOT "C:/ghs") set(GHS_EXPECTED_ROOT "C:/ghs")
if (EXISTS ${GHS_EXPECTED_ROOT}) if (EXISTS ${GHS_EXPECTED_ROOT})
FILE(GLOB GHS_CANDIDATE_INT_DIRS RELATIVE FILE(GLOB GHS_CANDIDATE_INT_DIRS RELATIVE

2
Modules/Platform/Windows-MSVC.cmake
View File

@ -299,7 +299,7 @@ macro(__windows_compiler_msvc lang)
"${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*") if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*")
# note: MSVC 14 2015 Update 1 sets -fno-ms-compatibility by default, but this does not allow to compile many projects # note: MSVC 14 2015 Update 1 sets -fno-ms-compatibility by default, but this does not allow one to compile many projects
# that include MS's own headers. CMake itself is affected project too. # that include MS's own headers. CMake itself is affected project too.
set(CMAKE_${lang}_FLAGS_INIT "${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} -fms-extensions -fms-compatibility -D_WINDOWS -Wall${_FLAGS_${lang}}") set(CMAKE_${lang}_FLAGS_INIT "${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} -fms-extensions -fms-compatibility -D_WINDOWS -Wall${_FLAGS_${lang}}")
set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-D_DEBUG /MDd -gline-tables-only -fno-inline -O0 ${_RTC1}") set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-D_DEBUG /MDd -gline-tables-only -fno-inline -O0 ${_RTC1}")

2
Modules/UseJava.cmake
View File

@ -324,7 +324,7 @@
# that allow your Java and C code to interact. # that allow your Java and C code to interact.
# #
# There are two main signatures for create_javah. The first signature # There are two main signatures for create_javah. The first signature
# returns generated files throught variable specified by GENERATED_FILES option: # returns generated files through variable specified by GENERATED_FILES option:
# #
# :: # ::
# #

2
Source/CTest/cmCTestBZR.cxx
View File

@ -80,7 +80,7 @@ cmCTestBZR::cmCTestBZR(cmCTest* ct, std::ostream& log):
cmCTestGlobalVC(ct, log) cmCTestGlobalVC(ct, log)
{ {
this->PriorRev = this->Unknown; this->PriorRev = this->Unknown;
// Even though it is specified in the documention, with bzr 1.13 // Even though it is specified in the documentation, with bzr 1.13
// BZR_PROGRESS_BAR has no effect. In the future this bug might be fixed. // BZR_PROGRESS_BAR has no effect. In the future this bug might be fixed.
// Since it doesn't hurt, we specify this environment variable. // Since it doesn't hurt, we specify this environment variable.
cmSystemTools::PutEnv("BZR_PROGRESS_BAR=none"); cmSystemTools::PutEnv("BZR_PROGRESS_BAR=none");

2
Source/CursesDialog/cmCursesStringWidget.cxx
View File

@ -105,7 +105,7 @@ bool cmCursesStringWidget::HandleInput(int& key, cmCursesMainForm* fm,
} }
} }
// If resize occured during edit, move out of edit mode // If resize occurred during edit, move out of edit mode
if (!this->InEdit && ( key != 10 && key != KEY_ENTER ) ) if (!this->InEdit && ( key != 10 && key != KEY_ENTER ) )
{ {
return false; return false;

4
Source/CursesDialog/form/fld_def.c
View File

@ -73,7 +73,7 @@ FIELD *_nc_Default_Field = &default_field;
| int *err ) | int *err )
| |
| Description : Create an argument structure for the specified type. | Description : Create an argument structure for the specified type.
| Use the type-dependant argument list to construct | Use the type-dependent argument list to construct
| it. | it.
| |
| Return Values : Pointer to argument structure. Maybe NULL. | Return Values : Pointer to argument structure. Maybe NULL.
@ -193,7 +193,7 @@ _nc_Free_Argument(const FIELDTYPE * typ, TypeArgument * argp)
| Description : Copy argument structure of field src to field dst | Description : Copy argument structure of field src to field dst
| |
| Return Values : TRUE - copy worked | Return Values : TRUE - copy worked
| FALSE - error occured | FALSE - error occurred
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
bool bool
_nc_Copy_Type(FIELD *dst, FIELD const *src) _nc_Copy_Type(FIELD *dst, FIELD const *src)

2
Source/CursesDialog/form/fld_ftlink.c
View File

@ -46,7 +46,7 @@ MODULE_ID("$Id$")
| E_BAD_ARGUMENT - invalid arguments | E_BAD_ARGUMENT - invalid arguments
| E_SYSTEM_ERROR - system error (no memory) | E_SYSTEM_ERROR - system error (no memory)
| |
| Return Values : Fieldtype pointer or NULL if error occured. | Return Values : Fieldtype pointer or NULL if error occurred.
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
FIELDTYPE *link_fieldtype(FIELDTYPE * type1, FIELDTYPE * type2) FIELDTYPE *link_fieldtype(FIELDTYPE * type1, FIELDTYPE * type2)
{ {

2
Source/CursesDialog/form/fld_newftyp.c
View File

@ -63,7 +63,7 @@ const FIELDTYPE* _nc_Default_FieldType = &default_fieldtype;
| E_BAD_ARGUMENT - invalid arguments | E_BAD_ARGUMENT - invalid arguments
| E_SYSTEM_ERROR - system error (no memory) | E_SYSTEM_ERROR - system error (no memory)
| |
| Return Values : Fieldtype pointer or NULL if error occured | Return Values : Fieldtype pointer or NULL if error occurred
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
FIELDTYPE *new_fieldtype( FIELDTYPE *new_fieldtype(
bool (* const field_check)(FIELD *,const void *), bool (* const field_check)(FIELD *,const void *),

2
Source/CursesDialog/form/form.priv.h
View File

@ -40,7 +40,7 @@
/* field status values */ /* field status values */
#define _CHANGED (0x01) /* Field has been changed */ #define _CHANGED (0x01) /* Field has been changed */
#define _NEWTOP (0x02) /* Vertical scrolling occured */ #define _NEWTOP (0x02) /* Vertical scrolling occurred */
#define _NEWPAGE (0x04) /* field begins new page of form */ #define _NEWPAGE (0x04) /* field begins new page of form */
#define _MAY_GROW (0x08) /* dynamic field may still grow */ #define _MAY_GROW (0x08) /* dynamic field may still grow */

4
Source/CursesDialog/form/frm_def.c
View File

@ -240,7 +240,7 @@ static int Connect_Fields(FORM * form, FIELD ** fields)
| If there are fields, position to first active field. | If there are fields, position to first active field.
| |
| Return Values : E_OK - success | Return Values : E_OK - success
| any other - error occured | any other - error occurred
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
INLINE static int Associate_Fields(FORM *form, FIELD **fields) INLINE static int Associate_Fields(FORM *form, FIELD **fields)
{ {
@ -267,7 +267,7 @@ INLINE static int Associate_Fields(FORM *form, FIELD **fields)
| |
| Description : Create new form with given array of fields. | Description : Create new form with given array of fields.
| |
| Return Values : Pointer to form. NULL if error occured. | Return Values : Pointer to form. NULL if error occurred.
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
FORM *new_form(FIELD ** fields) FORM *new_form(FIELD ** fields)
{ {

4
Source/CursesDialog/form/frm_driver.c
View File

@ -1676,7 +1676,7 @@ static int VSC_Generic(FORM *form, int lines)
| |
| Description : Performs the generic vertical scrolling routines. | Description : Performs the generic vertical scrolling routines.
| This has to check for a multi-line field and to set | This has to check for a multi-line field and to set
| the _NEWTOP flag if scrolling really occured. | the _NEWTOP flag if scrolling really occurred.
| |
| Return Values : Propagated error code from low-level driver calls | Return Values : Propagated error code from low-level driver calls
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
@ -2159,7 +2159,7 @@ static int Wrapping_Not_Necessary_Or_Wrapping_Ok(FORM * form)
| |
| Description : Generic routine for field editing requests. The driver | Description : Generic routine for field editing requests. The driver
| routines are only called for editable fields, the | routines are only called for editable fields, the
| _WINDOW_MODIFIED flag is set if editing occured. | _WINDOW_MODIFIED flag is set if editing occurred.
| This is somewhat special due to the overload semantics | This is somewhat special due to the overload semantics
| of the NEW_LINE and DEL_PREV requests. | of the NEW_LINE and DEL_PREV requests.
| |

2
Source/cmFileCommand.cxx
View File

@ -1015,7 +1015,7 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
else else
{ {
this->Makefile->IssueMessage(cmake::FATAL_ERROR, this->Makefile->IssueMessage(cmake::FATAL_ERROR,
"Error has occured while globbing for '" "Error has occurred while globbing for '"
+ *i + "' - " + it->content); + *i + "' - " + it->content);
shouldExit = true; shouldExit = true;
} }

2
Source/cmFortranLexer.cxx
View File

@ -1241,7 +1241,7 @@ case 43:
/* rule 43 can match eol */ /* rule 43 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 172 "cmFortranLexer.in.l" #line 172 "cmFortranLexer.in.l"
/* Ignore line-endings preceeded by \ */ /* Ignore line-endings preceded by \ */
YY_BREAK YY_BREAK
case 44: case 44:
YY_RULE_SETUP YY_RULE_SETUP

2
Source/cmFortranLexer.in.l
View File

@ -169,7 +169,7 @@ $[ \t]*endif { return F90PPR_ENDIF; }
[ \t\r,] /* Ignore */ [ \t\r,] /* Ignore */
\\[ \t]*\n /* Ignore line-endings preceeded by \ */ \\[ \t]*\n /* Ignore line-endings preceded by \ */
. { return *yytext; } . { return *yytext; }

2
Source/cmListFileCache.cxx
View File

@ -249,7 +249,7 @@ bool cmListFile::ParseFile(const char* filename,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmListFileParser::ParseFunction(const char* name, long line) bool cmListFileParser::ParseFunction(const char* name, long line)
{ {
// Inintialize a new function call. // Ininitialize a new function call.
this->Function = cmListFileFunction(); this->Function = cmListFileFunction();
this->Function.Name = name; this->Function.Name = name;
this->Function.Line = line; this->Function.Line = line;

6
Source/cmQtAutoGenerators.cxx
View File

@ -795,7 +795,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
"\", but does not contain a " << macroName "\", but does not contain a " << macroName
<< " macro. Running moc on " << " macro. Running moc on "
<< "\"" << headerToMoc << "\" ! Include \"moc_" << "\"" << headerToMoc << "\" ! Include \"moc_"
<< basename << ".cpp\" for a compatiblity with " << basename << ".cpp\" for a compatibility with "
"strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n" "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
<< std::endl; << std::endl;
} }
@ -806,7 +806,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
"\" instead of \"moc_" << basename << ".cpp\". " "\" instead of \"moc_" << basename << ".cpp\". "
"Running moc on " "Running moc on "
<< "\"" << headerToMoc << "\" ! Include \"moc_" << "\"" << headerToMoc << "\" ! Include \"moc_"
<< basename << ".cpp\" for compatiblity with " << basename << ".cpp\" for compatibility with "
"strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n" "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
<< std::endl; << std::endl;
} }
@ -848,7 +848,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
"includes " "includes "
<< "\"" << ownMocUnderscoreFile << "\". Running moc on " << "\"" << ownMocUnderscoreFile << "\". Running moc on "
<< "\"" << absFilename << "\" ! Better include \"" << "\"" << absFilename << "\" ! Better include \""
<< scannedFileBasename << ".moc\" for compatiblity with " << scannedFileBasename << ".moc\" for compatibility with "
"strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n" "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
<< std::endl; << std::endl;
includedMocs[absFilename] = ownMocUnderscoreFile; includedMocs[absFilename] = ownMocUnderscoreFile;

2
Source/cmStringCommand.cxx
View File

@ -565,7 +565,7 @@ bool cmStringCommand::HandleFindCommand(std::vector<std::string> const&
// ensure that the user cannot accidentally specify REVERSE as a variable // ensure that the user cannot accidentally specify REVERSE as a variable
if(outvar == "REVERSE") if(outvar == "REVERSE")
{ {
this->SetError("sub-command FIND does not allow to select REVERSE as " this->SetError("sub-command FIND does not allow one to select REVERSE as "
"the output variable. " "the output variable. "
"Maybe you missed the actual output variable?"); "Maybe you missed the actual output variable?");
return false; return false;

2
Source/cmSystemTools.h
View File

@ -116,7 +116,7 @@ public:
return cmSystemTools::s_FatalErrorOccured || GetInterruptFlag(); return cmSystemTools::s_FatalErrorOccured || GetInterruptFlag();
} }
///! Set the error occured flag and fatal error back to false ///! Set the error occurred flag and fatal error back to false
static void ResetErrorOccuredFlag() static void ResetErrorOccuredFlag()
{ {
cmSystemTools::s_FatalErrorOccured = false; cmSystemTools::s_FatalErrorOccured = false;

2
Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake
View File

@ -99,7 +99,7 @@ was expected."
endif() endif()
if( EXISTS ${FETCH_HEAD_file} ) if( EXISTS ${FETCH_HEAD_file} )
message( FATAL_ERROR "Fetch occured when it was not expected.") message( FATAL_ERROR "Fetch occurred when it was not expected.")
endif() endif()
# Check the resulting SHA # Check the resulting SHA

2
Utilities/cmcurl/lib/curl_sasl_gssapi.c
View File

@ -70,7 +70,7 @@ char *Curl_sasl_build_gssapi_spn(const char *service, const char *host)
* userp [in] - The user name. * userp [in] - The user name.
* passdwp [in] - The user's password. * passdwp [in] - The user's password.
* service [in] - The service type such as www, smtp, pop or imap. * service [in] - The service type such as www, smtp, pop or imap.
* mutual_auth [in] - Flag specifing whether or not mutual authentication * mutual_auth [in] - Flag specifying whether or not mutual authentication
* is enabled. * is enabled.
* chlg64 [in] - Pointer to the optional base64 encoded challenge * chlg64 [in] - Pointer to the optional base64 encoded challenge
* message. * message.

2
Utilities/cmcurl/lib/curl_sasl_sspi.c
View File

@ -846,7 +846,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm)
* userp [in] - The user name in the format User or Domain\User. * userp [in] - The user name in the format User or Domain\User.
* passdwp [in] - The user's password. * passdwp [in] - The user's password.
* service [in] - The service type such as www, smtp, pop or imap. * service [in] - The service type such as www, smtp, pop or imap.
* mutual_auth [in] - Flag specifing whether or not mutual authentication * mutual_auth [in] - Flag specifying whether or not mutual authentication
* is enabled. * is enabled.
* chlg64 [in] - The optional base64 encoded challenge message. * chlg64 [in] - The optional base64 encoded challenge message.
* krb5 [in/out] - The gssapi data struct being used and modified. * krb5 [in/out] - The gssapi data struct being used and modified.

2
Utilities/cmcurl/lib/ftp.c
View File

@ -3671,7 +3671,7 @@ static CURLcode ftp_do_more(struct connectdata *conn, int *completep)
} }
if(ftpc->state) { if(ftpc->state) {
/* already in a state so skip the intial commands. /* already in a state so skip the initial commands.
They are only done to kickstart the do_more state */ They are only done to kickstart the do_more state */
result = ftp_multi_statemach(conn, &complete); result = ftp_multi_statemach(conn, &complete);

2
Utilities/cmlibarchive/CMakeLists.txt
View File

@ -200,7 +200,7 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
# e.g. # e.g.
# cmake -DCMAKE_PREFIX_PATH=<your-GnuWin32-path> <path-to-source> # cmake -DCMAKE_PREFIX_PATH=<your-GnuWin32-path> <path-to-source>
# #
# If compiling error occured in zconf.h, You may need patch to zconf.h. # If compiling error occurred in zconf.h, You may need patch to zconf.h.
#--- zconf.h.orig 2005-07-21 00:40:26.000000000 #--- zconf.h.orig 2005-07-21 00:40:26.000000000
#+++ zconf.h 2009-01-19 11:39:10.093750000 #+++ zconf.h 2009-01-19 11:39:10.093750000
#@@ -286,7 +286,7 @@ #@@ -286,7 +286,7 @@

2
Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c
View File

@ -1586,7 +1586,7 @@ tree_reopen(struct tree *t, const wchar_t *path, int restore_time)
t->stack->flags = needsFirstVisit; t->stack->flags = needsFirstVisit;
/* /*
* Debug flag for Direct IO(No buffering) or Async IO. * Debug flag for Direct IO(No buffering) or Async IO.
* Those dependant on environment variable switches * Those dependent on environment variable switches
* will be removed until next release. * will be removed until next release.
*/ */
{ {

2
Utilities/cmlibarchive/libarchive/xxhash.c
View File

@ -53,7 +53,7 @@ You can contact the author at :
** #define XXH_ACCEPT_NULL_INPUT_POINTER 1 ** #define XXH_ACCEPT_NULL_INPUT_POINTER 1
** XXH_FORCE_NATIVE_FORMAT : ** XXH_FORCE_NATIVE_FORMAT :
** By default, xxHash library provides endian-independant Hash values, based on little-endian convention. ** By default, xxHash library provides endian-independent Hash values, based on little-endian convention.
** Results are therefore identical for little-endian and big-endian CPU. ** Results are therefore identical for little-endian and big-endian CPU.
** This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format. ** This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format.
** Should endian-independance be of no importance for your application, you may set the #define below to 1. ** Should endian-independance be of no importance for your application, you may set the #define below to 1.