mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-12 09:08:58 -05:00
Merge topic 'codespell'
fd02f10103Xcode: Fix typos and spelling in error message5950e54325Source: Fix typos and spelling in comments7072d83772Help: Fix typos and spelling in documentation03b1140ddcCONTRIBUTING: Fix typos and spelling87f8843d8bFindMatlab: Fix spelling in warning and documentation15cc39ed7fModules: Fix typos and spelling in documentationf015c36c5aModules: Fix typos and spelling in comments of generated codedad5b9d845Modules: Fix typos and spelling in comments ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6099
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
[codespell]
|
||||
check-filenames =
|
||||
check-hidden =
|
||||
count =
|
||||
# Disable warnings about binary files
|
||||
quiet-level = 2
|
||||
builtin = clear,rare,en-GB_to_en-US
|
||||
skip = */.git,*/Copyright.txt,*/doxygen.config,*/Modules/Internal/CPack/NSIS.template.in,*/Source/CursesDialog/form/*,*/Source/kwsys/*,*/Tests/RunCMake/CPack/tests/DMG_SLA/German.*,*/Utilities/cm*
|
||||
ignore-words-list = aci,ake,ans,ba,cconfiguration,conly,dependees,dne,dum,earch,ect,filetest,fo,helpfull,hiden,isnt,keypair,nd,ned,nin,nknown,ot,pard,seh,ser,te,upto,varn,vas,wee
|
||||
@@ -1,5 +1,6 @@
|
||||
.git* export-ignore
|
||||
.hooks* export-ignore
|
||||
.codespellrc export-ignore
|
||||
.editorconfig export-ignore
|
||||
|
||||
# Custom attribute to mark sources as using our C code style.
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
" Former Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com>
|
||||
" Last Change: @DATE@
|
||||
"
|
||||
" Licence: The CMake license applies to this file. See
|
||||
" License: The CMake license applies to this file. See
|
||||
" https://cmake.org/licensing
|
||||
" This implies that distribution with Vim is allowed
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
" Former Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com>
|
||||
" Last Change: 2017 Aug 30
|
||||
"
|
||||
" Licence: The CMake license applies to this file. See
|
||||
" License: The CMake license applies to this file. See
|
||||
" https://cmake.org/licensing
|
||||
" This implies that distribution with Vim is allowed
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
" Former Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com>
|
||||
" Last Change: 2020 oct. 28
|
||||
"
|
||||
" Licence: The CMake license applies to this file. See
|
||||
" License: The CMake license applies to this file. See
|
||||
" https://cmake.org/licensing
|
||||
" This implies that distribution with Vim is allowed
|
||||
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ To contribute patches:
|
||||
#. Push the topic branch to a personal repository fork on GitLab.
|
||||
#. Create a GitLab Merge Request targeting the upstream ``master`` branch
|
||||
(even if the change is intended for merge to the ``release`` branch).
|
||||
Check the box labelled "Allow commits from members who can merge to the
|
||||
Check the box labeled "Allow commits from members who can merge to the
|
||||
target branch". This will allow maintainers to make minor edits on your
|
||||
behalf.
|
||||
|
||||
|
||||
@@ -190,7 +190,7 @@ For example, the code:
|
||||
.. code-block:: cmake
|
||||
|
||||
cmake_language(DEFER CALL message "${deferred_message}")
|
||||
cmake_language(DEFER ID_VAR id CALL message "Cancelled Message")
|
||||
cmake_language(DEFER ID_VAR id CALL message "Canceled Message")
|
||||
cmake_language(DEFER CANCEL_CALL ${id})
|
||||
message("Immediate Message")
|
||||
set(deferred_message "Deferred Message")
|
||||
@@ -201,7 +201,7 @@ prints::
|
||||
Deferred Message
|
||||
|
||||
The ``Cancelled Message`` is never printed because its command is
|
||||
cancelled. The ``deferred_message`` variable reference is not evaluated
|
||||
canceled. The ``deferred_message`` variable reference is not evaluated
|
||||
until the call site, so it can be set after the deferred call is scheduled.
|
||||
|
||||
In order to evaluate variable references immediately when scheduling a
|
||||
|
||||
@@ -724,7 +724,7 @@ executable from the installation tree using the imported target name
|
||||
``mp_myexe`` as if the target were built in its own tree.
|
||||
|
||||
.. note::
|
||||
This command supercedes the :command:`install_targets` command and
|
||||
This command supersedes the :command:`install_targets` command and
|
||||
the :prop_tgt:`PRE_INSTALL_SCRIPT` and :prop_tgt:`POST_INSTALL_SCRIPT`
|
||||
target properties. It also replaces the ``FILES`` forms of the
|
||||
:command:`install_files` and :command:`install_programs` commands.
|
||||
|
||||
@@ -5,7 +5,7 @@ install_files
|
||||
|
||||
Use the :command:`install(FILES)` command instead.
|
||||
|
||||
This command has been superceded by the :command:`install` command. It is
|
||||
This command has been superseded by the :command:`install` command. It is
|
||||
provided for compatibility with older CMake code. The ``FILES`` form is
|
||||
directly replaced by the ``FILES`` form of the :command:`install`
|
||||
command. The regexp form can be expressed more clearly using the ``GLOB``
|
||||
|
||||
@@ -5,7 +5,7 @@ install_programs
|
||||
|
||||
Use the :command:`install(PROGRAMS)` command instead.
|
||||
|
||||
This command has been superceded by the :command:`install` command. It is
|
||||
This command has been superseded by the :command:`install` command. It is
|
||||
provided for compatibility with older CMake code. The ``FILES`` form is
|
||||
directly replaced by the ``PROGRAMS`` form of the :command:`install`
|
||||
command. The regexp form can be expressed more clearly using the ``GLOB``
|
||||
|
||||
@@ -5,7 +5,7 @@ install_targets
|
||||
|
||||
Use the :command:`install(TARGETS)` command instead.
|
||||
|
||||
This command has been superceded by the :command:`install` command. It is
|
||||
This command has been superseded by the :command:`install` command. It is
|
||||
provided for compatibility with older CMake code.
|
||||
|
||||
::
|
||||
|
||||
@@ -289,7 +289,7 @@ List of CPack DEB generator specific variables:
|
||||
* Default : "optional"
|
||||
|
||||
.. versionadded:: 3.5
|
||||
Per-component ``CPACK_DEBIAN_<COMPONENT>_PACKAGE_PRIORITY`` varables.
|
||||
Per-component ``CPACK_DEBIAN_<COMPONENT>_PACKAGE_PRIORITY`` variables.
|
||||
|
||||
See https://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ on macOS:
|
||||
|
||||
.. versionadded:: 3.6
|
||||
|
||||
Default behaviour is to include a symlink to ``/Applications`` in the DMG.
|
||||
Default behavior is to include a symlink to ``/Applications`` in the DMG.
|
||||
Set this option to ``ON`` to avoid adding the symlink.
|
||||
|
||||
.. variable:: CPACK_DMG_SLA_DIR
|
||||
|
||||
@@ -8,4 +8,4 @@
|
||||
See the :variable:`CMAKE_GENERATOR_TOOLSET` variable for details.
|
||||
|
||||
.. versionadded:: 3.14
|
||||
Added suport for ``host=x86`` option.
|
||||
Added support for ``host=x86`` option.
|
||||
|
||||
@@ -640,7 +640,7 @@ We can use the :command:`find_package` command:
|
||||
:start-after: # find MathFunctions
|
||||
:end-before: # create executable
|
||||
|
||||
Create an exectuable:
|
||||
Create an executable:
|
||||
|
||||
.. literalinclude:: Downstream/CMakeLists.txt
|
||||
:language: cmake
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
:variable:`CMAKE_GENERATOR_PLATFORM` variable for details.
|
||||
|
||||
``--toolchain <path-to-file>``
|
||||
Specify the cross compiling toolchain file, equivalant to setting
|
||||
Specify the cross compiling toolchain file, equivalent to setting
|
||||
:variable:`CMAKE_TOOLCHAIN_FILE` variable.
|
||||
|
||||
``--install-prefix <directory>``
|
||||
|
||||
@@ -1437,7 +1437,7 @@ The members specific to ``toolchains`` objects are:
|
||||
|
||||
``language``
|
||||
A JSON string specifying the toolchain language, like C or CXX. Language
|
||||
names are the same as langauge names that can be passed to the
|
||||
names are the same as language names that can be passed to the
|
||||
:command:`project` command. Because CMake only supports a single toolchain
|
||||
per language, this field can be used as a key.
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ Policies Introduced by CMake 3.21
|
||||
CMP0124: foreach() loop variables are only available in the loop scope. </policy/CMP0124>
|
||||
CMP0123: ARMClang cpu/arch compile and link flags must be set explicitly. </policy/CMP0123>
|
||||
CMP0122: UseSWIG use standard library name conventions for csharp language. </policy/CMP0122>
|
||||
CMP0121: The list command detects invalid indicies. </policy/CMP0121>
|
||||
CMP0121: The list command detects invalid indices. </policy/CMP0121>
|
||||
|
||||
Policies Introduced by CMake 3.20
|
||||
=================================
|
||||
|
||||
@@ -702,7 +702,7 @@ Available commands are:
|
||||
``remove [-f] <file>...``
|
||||
.. deprecated:: 3.17
|
||||
|
||||
Remove the file(s). The planned behaviour was that if any of the
|
||||
Remove the file(s). The planned behavior was that if any of the
|
||||
listed files already do not exist, the command returns a non-zero exit code,
|
||||
but no message is logged. The ``-f`` option changes the behavior to return a
|
||||
zero exit code (i.e. success) in such situations instead.
|
||||
|
||||
@@ -8,7 +8,7 @@ CMP0110
|
||||
:command:`add_test` can now (officially) create tests with whitespace and
|
||||
other special characters in its name. Before CMake version 3.19 that was not
|
||||
allowed, however, it was possible to work around this limitation by explicitly
|
||||
putting escaped quotes arount the test's name in the ``add_test`` command.
|
||||
putting escaped quotes around the test's name in the ``add_test`` command.
|
||||
|
||||
Although never officially supported several projects in the wild found and
|
||||
implemented this workaround. However, the new change which officially allows
|
||||
|
||||
@@ -3,16 +3,16 @@ CMP0121
|
||||
|
||||
.. versionadded:: 3.21
|
||||
|
||||
The :command:`list` command now detects invalid indicies.
|
||||
The :command:`list` command now detects invalid indices.
|
||||
|
||||
Prior to CMake version 3.21, the :command:`list` command's ``GET``,
|
||||
``INSERT``, ``SUBLIST``, and ``REMOVE_AT`` subcommands did not detect invalid
|
||||
index arguments.
|
||||
|
||||
The ``OLD`` behavior of this policy is for invalid indicies to be treated as
|
||||
The ``OLD`` behavior of this policy is for invalid indices to be treated as
|
||||
their integer value (if any) at the start of the string. For example,
|
||||
``2good4you`` is a ``2`` and ``not_an_integer`` is a ``0``. The ``NEW``
|
||||
behavior is for invalid indicies to trigger an error.
|
||||
behavior is for invalid indices to trigger an error.
|
||||
|
||||
This policy was introduced in CMake version 3.21. CMake version |release|
|
||||
warns when the policy is not set and uses ``OLD`` behavior. Use the
|
||||
|
||||
@@ -35,9 +35,9 @@ The concept of a fixture is different to that of a resource specified by
|
||||
set of tests which share setup and cleanup requirements, whereas a resource
|
||||
lock has the effect of ensuring a particular set of tests do not run in
|
||||
parallel. Some situations may need both, such as setting up a database,
|
||||
serialising test access to that database and deleting the database again at the
|
||||
serializing test access to that database and deleting the database again at the
|
||||
end. For such cases, tests would populate both ``FIXTURES_REQUIRED`` and
|
||||
:prop_test:`RESOURCE_LOCK` to combine the two behaviours. Names used for
|
||||
:prop_test:`RESOURCE_LOCK` to combine the two behaviors. Names used for
|
||||
:prop_test:`RESOURCE_LOCK` have no relationship with names of fixtures, so note
|
||||
that a resource lock does not imply a fixture and vice versa.
|
||||
|
||||
|
||||
@@ -9,4 +9,4 @@ If the target contains Swift source files, this specifies the directory in which
|
||||
the modules will be placed. When this property is not set, the modules will be
|
||||
placed in the build directory corresponding to the target's source directory.
|
||||
If the variable :variable:`CMAKE_Swift_MODULE_DIRECTORY` is set when a target is
|
||||
created its value is used to initialise this property.
|
||||
created its value is used to initialize this property.
|
||||
|
||||
@@ -50,6 +50,6 @@ be used to avoid that with code like the following:
|
||||
return MY_UNITY_ID::i;
|
||||
}
|
||||
|
||||
The pseudononymous namespace is used within a truly anonymous namespace.
|
||||
The pseudonymous namespace is used within a truly anonymous namespace.
|
||||
On many platforms, this maintains the invariant that the symbols within
|
||||
do not get external linkage when performing a unity build.
|
||||
|
||||
@@ -40,7 +40,7 @@ Languages
|
||||
customize the Swift module name.
|
||||
|
||||
* The :prop_sf:`Swift_DIAGNOSTICS_FILE` source property was added to
|
||||
indicate where to write the serialised Swift diagnostics.
|
||||
indicate where to write the serialized Swift diagnostics.
|
||||
|
||||
The Swift support is experimental, not considered stable, and may change
|
||||
in future releases of CMake.
|
||||
|
||||
@@ -233,7 +233,7 @@ Deprecated and Removed Features
|
||||
instead.
|
||||
|
||||
* The :module:`GetPrerequisites` module has been deprecated, as it has been
|
||||
superceded by :command:`file(GET_RUNTIME_DEPENDENCIES)`.
|
||||
superseded by :command:`file(GET_RUNTIME_DEPENDENCIES)`.
|
||||
|
||||
* The ``CPACK_INSTALL_SCRIPT`` variable has been deprecated in favor of the
|
||||
new, more accurately named :variable:`CPACK_INSTALL_SCRIPTS` variable.
|
||||
|
||||
@@ -170,7 +170,7 @@ CPack
|
||||
is used for dependency auto detection.
|
||||
|
||||
* The :cpack_gen:`CPack DEB Generator` learned how to generate
|
||||
``DEBIAN/shlibs`` contorl file when package contains shared libraries.
|
||||
``DEBIAN/shlibs`` control file when package contains shared libraries.
|
||||
|
||||
* The :cpack_gen:`CPack DEB Generator` learned how to generate
|
||||
``DEBIAN/postinst`` and ``DEBIAN/postrm`` files if the package installs
|
||||
|
||||
@@ -8,7 +8,7 @@ Switch between strict and relaxed automoc mode.
|
||||
By default, :prop_tgt:`AUTOMOC` behaves exactly as described in the
|
||||
documentation of the :prop_tgt:`AUTOMOC` target property. When set to
|
||||
``TRUE``, it accepts more input and tries to find the correct input file for
|
||||
``moc`` even if it differs from the documented behaviour. In this mode it
|
||||
``moc`` even if it differs from the documented behavior. In this mode it
|
||||
e.g. also checks whether a header file is intended to be processed by moc
|
||||
when a ``"foo.moc"`` file has been included.
|
||||
|
||||
|
||||
@@ -5,6 +5,6 @@ CMAKE_Swift_MODULE_DIRECTORY
|
||||
|
||||
Swift module output directory.
|
||||
|
||||
This variable is used to initialise the :prop_tgt:`Swift_MODULE_DIRECTORY`
|
||||
This variable is used to initialize the :prop_tgt:`Swift_MODULE_DIRECTORY`
|
||||
property on all the targets. See the target property for additional
|
||||
information.
|
||||
|
||||
@@ -3,6 +3,6 @@ EXECUTABLE_OUTPUT_PATH
|
||||
|
||||
Old executable location variable.
|
||||
|
||||
The target property :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` supercedes this
|
||||
The target property :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` supersedes this
|
||||
variable for a target if it is set. Executable targets are otherwise placed in
|
||||
this directory.
|
||||
|
||||
@@ -320,7 +320,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
|
||||
set(id_cl "$(CLToolExe)")
|
||||
elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*")
|
||||
set(id_cl clang.exe)
|
||||
# Executable names have choosen according documentation
|
||||
# Executable names have been chosen according documentation
|
||||
# URL: (https://software.intel.com/content/www/us/en/develop/documentation/get-started-with-dpcpp-compiler/top.html#top_GUID-A9B4C91D-97AC-450D-9742-9D895BC8AEE1)
|
||||
elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "Intel")
|
||||
if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "DPC\\+\\+ Compiler")
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
PRINT *, 'INFO:compiler[IntelLLVM]'
|
||||
! __INTEL_LLVM_COMPILER = VVVVRP prior to 2021.2.0, VVVVRRPP for 2021.2.0 and
|
||||
! later. Look for 6 digit vs. 8 digit version number to decide encoding.
|
||||
! VVVV is no smaller than the current year when a versio is released.
|
||||
! VVVV is no smaller than the current year when a version is released.
|
||||
# if __INTEL_LLVM_COMPILER < 1000000
|
||||
# define COMPILER_VERSION_MAJOR DEC(__INTEL_LLVM_COMPILER/100)
|
||||
# define COMPILER_VERSION_MINOR DEC(__INTEL_LLVM_COMPILER/10 % 10)
|
||||
|
||||
@@ -143,12 +143,12 @@ The ``COMPATIBILITY`` mode ``AnyNewerVersion`` means that the installed
|
||||
package version will be considered compatible if it is newer or exactly the
|
||||
same as the requested version. This mode should be used for packages which
|
||||
are fully backward compatible, also across major versions.
|
||||
If ``SameMajorVersion`` is used instead, then the behaviour differs from
|
||||
If ``SameMajorVersion`` is used instead, then the behavior differs from
|
||||
``AnyNewerVersion`` in that the major version number must be the same as
|
||||
requested, e.g. version 2.0 will not be considered compatible if 1.0 is
|
||||
requested. This mode should be used for packages which guarantee backward
|
||||
compatibility within the same major version.
|
||||
If ``SameMinorVersion`` is used, the behaviour is the same as
|
||||
If ``SameMinorVersion`` is used, the behavior is the same as
|
||||
``SameMajorVersion``, but both major and minor version must be the same as
|
||||
requested, e.g version 0.2 will not be compatible if 0.1 is requested.
|
||||
If ``ExactVersion`` is used, then the package is only considered compatible if
|
||||
|
||||
@@ -4,7 +4,7 @@ set(_compiler_id_pp_test "(defined(__clang__) && defined(__INTEL_CLANG_COMPILER)
|
||||
set(_compiler_id_version_compute "
|
||||
/* __INTEL_LLVM_COMPILER = VVVVRP prior to 2021.2.0, VVVVRRPP for 2021.2.0 and
|
||||
* later. Look for 6 digit vs. 8 digit version number to decide encoding.
|
||||
* VVVV is no smaller than the current year when a versio is released.
|
||||
* VVVV is no smaller than the current year when a version is released.
|
||||
*/
|
||||
#if __INTEL_LLVM_COMPILER < 1000000L
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__INTEL_LLVM_COMPILER/100)
|
||||
|
||||
@@ -296,7 +296,7 @@ is simpler and provides additional features over the pattern above.
|
||||
The ``FetchContent_Populate()`` command also supports a syntax allowing the
|
||||
content details to be specified directly rather than using any saved
|
||||
details. This is more low-level and use of this form is generally to be
|
||||
avoided in favour of using saved content details as outlined above.
|
||||
avoided in favor of using saved content details as outlined above.
|
||||
Nevertheless, in certain situations it can be useful to invoke the content
|
||||
population as an isolated operation (typically as part of implementing some
|
||||
other higher level feature or when using CMake in script mode):
|
||||
@@ -1053,7 +1053,7 @@ function(FetchContent_Populate contentName)
|
||||
# Don't set global properties, or record that we did this population, since
|
||||
# this was a direct call outside of the normal declared details form.
|
||||
# We only want to save values in the global properties for content that
|
||||
# honours the hierarchical details mechanism so that projects are not
|
||||
# honors the hierarchical details mechanism so that projects are not
|
||||
# robbed of the ability to override details set in nested projects.
|
||||
return()
|
||||
endif()
|
||||
|
||||
@@ -108,7 +108,7 @@ if(APPLE)
|
||||
set( FLTK_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
|
||||
endif()
|
||||
|
||||
# If FLTK_INCLUDE_DIR is already defined we assigne its value to FLTK_DIR
|
||||
# If FLTK_INCLUDE_DIR is already defined we assign its value to FLTK_DIR.
|
||||
if(FLTK_INCLUDE_DIR)
|
||||
set(FLTK_DIR ${FLTK_INCLUDE_DIR})
|
||||
endif()
|
||||
|
||||
@@ -39,7 +39,7 @@ LANGUAGES <lang1> <lang2> ... )
|
||||
If INSTALL_DESTINATION is given then automatically install rules will
|
||||
be created, the language subdirectory will be taken into account
|
||||
(by default use share/locale/).
|
||||
If ALL is specified, the pot file is processed when building the all traget.
|
||||
If ALL is specified, the pot file is processed when building the all target.
|
||||
It creates a custom target "potfile".
|
||||
|
||||
GETTEXT_PROCESS_PO_FILES( <lang> [ALL] [INSTALL_DESTINATION <dir>]
|
||||
@@ -51,7 +51,7 @@ PO_FILES <po1> <po2> ... )
|
||||
If INSTALL_DESTINATION is given then automatically install rules will
|
||||
be created, the language subdirectory will be taken into account
|
||||
(by default use share/locale/).
|
||||
If ALL is specified, the po files are processed when building the all traget.
|
||||
If ALL is specified, the po files are processed when building the all target.
|
||||
It creates a custom target "pofiles".
|
||||
|
||||
.. versionadded:: 3.2
|
||||
|
||||
@@ -80,7 +80,7 @@ macro(java_append_library_directories _var)
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
|
||||
set(_java_libarch "ppc" "ppc64")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
|
||||
# Both flavours can run on the same processor
|
||||
# Both flavors can run on the same processor
|
||||
set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")
|
||||
set(_java_libarch "parisc" "parisc64")
|
||||
|
||||
@@ -52,7 +52,7 @@ The module supports the following components:
|
||||
between the release name and the version.
|
||||
|
||||
The variable :variable:`Matlab_ROOT_DIR` may be specified in order to give
|
||||
the path of the desired Matlab version. Otherwise, the behaviour is platform
|
||||
the path of the desired Matlab version. Otherwise, the behavior is platform
|
||||
specific:
|
||||
|
||||
* Windows: The installed versions of Matlab/MCR are retrieved from the
|
||||
@@ -83,7 +83,7 @@ Module Input Variables
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
Users or projects may set the following variables to configure the module
|
||||
behaviour:
|
||||
behavior:
|
||||
|
||||
:variable:`Matlab_ROOT_DIR`
|
||||
the root of the Matlab installation.
|
||||
@@ -184,7 +184,7 @@ Known issues
|
||||
**Symbol clash in a MEX target**
|
||||
By default, every symbols inside a MEX
|
||||
file defined with the command :command:`matlab_add_mex` have hidden
|
||||
visibility, except for the entry point. This is the default behaviour of
|
||||
visibility, except for the entry point. This is the default behavior of
|
||||
the MEX compiler, which lowers the risk of symbol collision between the
|
||||
libraries shipped with Matlab, and the libraries to which the MEX file is
|
||||
linking to. This is also the default on Windows platforms.
|
||||
@@ -223,7 +223,7 @@ Reference
|
||||
.. variable:: MATLAB_ADDITIONAL_VERSIONS
|
||||
|
||||
If set, specifies additional versions of Matlab that may be looked for.
|
||||
The variable should be a list of strings, organised by pairs of release
|
||||
The variable should be a list of strings, organized by pairs of release
|
||||
name and versions, such as follows::
|
||||
|
||||
set(MATLAB_ADDITIONAL_VERSIONS
|
||||
@@ -856,7 +856,7 @@ endfunction()
|
||||
where ``matlab_file_name`` is the ``UNITTEST_FILE`` without the extension.
|
||||
``UNITTEST_PRECOMMAND``
|
||||
Matlab script command to be ran before the file
|
||||
containing the test (eg. GPU device initialisation based on CMake
|
||||
containing the test (eg. GPU device initialization based on CMake
|
||||
variables).
|
||||
``TIMEOUT``
|
||||
the test timeout in seconds. Defaults to 180 seconds as the
|
||||
@@ -1240,7 +1240,7 @@ function(_Matlab_get_version_from_root matlab_root matlab_or_mcr matlab_known_ve
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# UNKNOWN is the default behaviour in case we
|
||||
# UNKNOWN is the default behavior in case we
|
||||
# - have an erroneous matlab_root
|
||||
# - have an initial 'UNKNOWN'
|
||||
if(matlab_or_mcr STREQUAL "MATLAB" OR matlab_or_mcr STREQUAL "UNKNOWN")
|
||||
@@ -1375,7 +1375,7 @@ function(_Matlab_find_instances_osx matlab_roots)
|
||||
|
||||
set(_matlab_possible_roots)
|
||||
# on mac, we look for the /Application paths
|
||||
# this corresponds to the behaviour on Windows. On Linux, we do not have
|
||||
# this corresponds to the behavior on Windows. On Linux, we do not have
|
||||
# any other guess.
|
||||
matlab_get_supported_releases(_matlab_releases)
|
||||
if(MATLAB_FIND_DEBUG)
|
||||
@@ -1416,7 +1416,7 @@ function(_Matlab_find_instances_from_path matlab_roots)
|
||||
set(_matlab_possible_roots)
|
||||
|
||||
# At this point, we have no other choice than trying to find it from PATH.
|
||||
# If set by the user, this wont change
|
||||
# If set by the user, this won't change.
|
||||
find_program(
|
||||
_matlab_main_tmp
|
||||
NAMES matlab)
|
||||
@@ -1552,7 +1552,7 @@ if(_numbers_of_matlab_roots GREATER 0)
|
||||
# adding a warning in case of ambiguity
|
||||
if(_numbers_of_matlab_roots GREATER 3 AND MATLAB_FIND_DEBUG)
|
||||
message(WARNING "[MATLAB] Found several distributions of Matlab. Setting the current version to ${Matlab_VERSION_STRING} (located ${Matlab_ROOT_DIR})."
|
||||
" If this is not the desired behaviour, use the EXACT keyword or provide the -DMatlab_ROOT_DIR=... on the command line")
|
||||
" If this is not the desired behavior, use the EXACT keyword or provide the -DMatlab_ROOT_DIR=... on the command line")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -352,7 +352,7 @@ macro(GNUInstallDirs_get_absolute_install_dir absvar var)
|
||||
if(GGAID_extra_arg_count GREATER 0)
|
||||
list(GET GGAID_extra_args 0 GGAID_dir)
|
||||
else()
|
||||
# Historical behaviour: use ${dir} from caller's scope
|
||||
# Historical behavior: use ${dir} from caller's scope
|
||||
set(GGAID_dir "${dir}")
|
||||
message(AUTHOR_WARNING
|
||||
"GNUInstallDirs_get_absolute_install_dir called without third argument. "
|
||||
|
||||
@@ -83,7 +83,7 @@ to 1 all prerequisites will be found recursively, if set to 0 only
|
||||
direct prerequisites are listed. <exclude_system> must be 0 or 1
|
||||
indicating whether to include or exclude "system" prerequisites. With
|
||||
<verbose> set to 0 only the full path names of the prerequisites are
|
||||
printed, set to 1 extra informatin will be displayed.
|
||||
printed, set to 1 extra information will be displayed.
|
||||
|
||||
::
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Define ARTOS to select proper behaviour and tell preprocessor to accept C++ style comments.
|
||||
# Define ARTOS to select proper behavior and tell preprocessor to accept C++ style comments.
|
||||
string(APPEND CMAKE_C_FLAGS_INIT " -DARTOS -Xp -+")
|
||||
# ac doesn't support -g properly and doesn't support the normal gcc optimization options. Just use the defaults set by ac.
|
||||
string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ")
|
||||
|
||||
@@ -324,7 +324,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
|
||||
staging << src_dir;
|
||||
|
||||
// Add a symlink to /Applications so users can drag-and-drop the bundle
|
||||
// into it unless this behaviour was disabled
|
||||
// into it unless this behavior was disabled
|
||||
if (!cpack_dmg_disable_applications_symlink) {
|
||||
std::ostringstream application_link;
|
||||
application_link << staging.str() << "/Applications";
|
||||
|
||||
@@ -1097,7 +1097,7 @@ void cmExtraEclipseCDT4Generator::AppendStorageScanners(
|
||||
compiler = "gcc";
|
||||
}
|
||||
|
||||
// the following right now hardcodes gcc behaviour :-/
|
||||
// the following right now hardcodes gcc behavior :-/
|
||||
std::string compilerArgs =
|
||||
"-E -P -v -dD ${plugin_state_location}/${specs_file}";
|
||||
if (!arg1.empty()) {
|
||||
|
||||
@@ -30,7 +30,7 @@ cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator(cmake* cm)
|
||||
/*
|
||||
* Borland Make does not support long line depend rule, as we have tested
|
||||
* generate one source file includes 40000 header files, and generate
|
||||
* depend.make in one line(use line continued tag), and error occured:
|
||||
* depend.make in one line(use line continued tag), and error occurred:
|
||||
* ** Fatal CMakeFiles\main.dir\depend.make 1224: Rule line too long **
|
||||
* we disable long line dependencies rule generation for Borland make
|
||||
*/
|
||||
|
||||
@@ -147,7 +147,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
|
||||
// write each target's progress.make this loop is done twice. Basically the
|
||||
// Generate pass counts all the actions, the first loop below determines
|
||||
// how many actions have progress updates for each target and writes to
|
||||
// corrrect variable values for everything except the all targets. The
|
||||
// correct variable values for everything except the all targets. The
|
||||
// second loop actually writes out correct values for the all targets as
|
||||
// well. This is because the all targets require more information that is
|
||||
// computed in the first loop.
|
||||
|
||||
@@ -393,7 +393,7 @@ bool cmGlobalXCodeGenerator::ProcessGeneratorToolsetField(
|
||||
" ", this->GetName(), "\n"
|
||||
"toolset specification field\n"
|
||||
" buildsystem=", value, "\n"
|
||||
"value is unkonwn. It must be '1' or '12'."
|
||||
"value is unknown. It must be '1' or '12'."
|
||||
);
|
||||
/* clang-format on */
|
||||
mf->IssueMessage(MessageType::FATAL_ERROR, e);
|
||||
|
||||
@@ -1972,7 +1972,7 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
|
||||
}
|
||||
}
|
||||
|
||||
// Add VFS Overlay for Clang compiliers
|
||||
// Add VFS Overlay for Clang compilers
|
||||
if (compiler == "Clang") {
|
||||
if (cmProp vfsOverlay =
|
||||
this->Makefile->GetDefinition("CMAKE_CLANG_VFS_OVERLAY")) {
|
||||
@@ -3931,7 +3931,7 @@ std::string ComputeCustomCommandRuleFileName(cmLocalGenerator& lg,
|
||||
|
||||
// The output path contains a generator expression, but we must choose
|
||||
// a single source file path to which to attach the custom command.
|
||||
// Use some heuristics to provie a nice-looking name when possible.
|
||||
// Use some heuristics to provide a nice-looking name when possible.
|
||||
|
||||
// If the only genex is $<CONFIG>, replace that gracefully.
|
||||
{
|
||||
@@ -4219,7 +4219,7 @@ std::vector<std::string> ComputeISPCObjectSuffixes(cmGeneratorTarget* target)
|
||||
auto pos = ispcTarget.find('-');
|
||||
auto target_suffix = ispcTarget.substr(0, pos);
|
||||
if (target_suffix ==
|
||||
"avx1") { // when targetting avx1 ISPC uses the 'avx' output string
|
||||
"avx1") { // when targeting avx1 ISPC uses the 'avx' output string
|
||||
target_suffix = "avx";
|
||||
}
|
||||
ispcTarget = target_suffix;
|
||||
|
||||
@@ -800,7 +800,7 @@ void cmMakefile::RunListFile(cmListFile const& listFile,
|
||||
for (size_t i = 0; i < defer->Commands.size(); ++i) {
|
||||
DeferCommand& d = defer->Commands[i];
|
||||
if (d.Id.empty()) {
|
||||
// Cancelled.
|
||||
// Canceled.
|
||||
continue;
|
||||
}
|
||||
// Mark as executed.
|
||||
|
||||
+1
-1
@@ -993,7 +993,7 @@ private:
|
||||
|
||||
struct DeferCommand
|
||||
{
|
||||
// Id is empty for an already-executed or cancelled operation.
|
||||
// Id is empty for an already-executed or canceled operation.
|
||||
std::string Id;
|
||||
std::string FilePath;
|
||||
cmListFileFunction Command;
|
||||
|
||||
@@ -512,7 +512,7 @@ void cmOrderDirectories::VisitDirectory(unsigned int i)
|
||||
}
|
||||
|
||||
// Now that all directories required to come before this one have
|
||||
// been emmitted, emit this directory.
|
||||
// been emitted, emit this directory.
|
||||
this->OrderedDirectories.push_back(this->OriginalDirectories[i]);
|
||||
}
|
||||
|
||||
|
||||
@@ -186,7 +186,7 @@ public:
|
||||
*
|
||||
* Output is controlled with outputflag. If outputflag is OUTPUT_NONE, no
|
||||
* user-viewable output from the program being run will be generated.
|
||||
* OUTPUT_MERGE is the legacy behaviour where stdout and stderr are merged
|
||||
* OUTPUT_MERGE is the legacy behavior where stdout and stderr are merged
|
||||
* into stdout. OUTPUT_FORWARD copies the output to stdout/stderr as
|
||||
* it was received. OUTPUT_PASSTHROUGH passes through the original handles.
|
||||
*
|
||||
|
||||
@@ -128,7 +128,7 @@ template <>
|
||||
struct uv_handle_deleter<uv_async_t>
|
||||
{
|
||||
/***
|
||||
* Wile uv_async_send is itself thread-safe, there are
|
||||
* While uv_async_send is itself thread-safe, there are
|
||||
* no strong guarantees that close hasn't already been
|
||||
* called on the handle; and that it might be deleted
|
||||
* as the send call goes through. This mutex guards
|
||||
|
||||
+1
-1
@@ -485,7 +485,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
|
||||
auto ScriptLambda = [&](std::string const& path, cmake* state) -> bool {
|
||||
// Register fake project commands that hint misuse in script mode.
|
||||
GetProjectCommandsInScriptMode(state->GetState());
|
||||
// Documented behaviour of CMAKE{,_CURRENT}_{SOURCE,BINARY}_DIR is to be
|
||||
// Documented behavior of CMAKE{,_CURRENT}_{SOURCE,BINARY}_DIR is to be
|
||||
// set to $PWD for -P mode.
|
||||
state->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory());
|
||||
state->SetHomeOutputDirectory(cmSystemTools::GetCurrentWorkingDirectory());
|
||||
|
||||
+2
-2
@@ -1936,8 +1936,8 @@ int cmcmd::RunLLVMRC(std::vector<std::string> const& args)
|
||||
skipNextArg = false;
|
||||
continue;
|
||||
}
|
||||
// We use ++ as seperator between the preprocessing step definition and
|
||||
// the rc compilation step becase we need to prepend a -- to seperate the
|
||||
// We use ++ as separator between the preprocessing step definition and
|
||||
// the rc compilation step because we need to prepend a -- to separate the
|
||||
// source file properly from other options when using clang-cl for
|
||||
// preprocessing.
|
||||
if (arg == "++") {
|
||||
|
||||
@@ -33,7 +33,7 @@ int testVisualStudioSlnParser(int, char* [])
|
||||
|
||||
// Test clean parser
|
||||
if (parser.GetParseResult() != cmVisualStudioSlnParser::ResultOK) {
|
||||
std::cerr << "cmVisualStudioSlnParser initialisation failed" << std::endl;
|
||||
std::cerr << "cmVisualStudioSlnParser initialization failed" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -146,7 +146,7 @@ endfunction()
|
||||
|
||||
|
||||
# This function runs dpkg-deb on a .deb and returns its output
|
||||
# the default behaviour it to run "--info" on the specified Debian package
|
||||
# the default behavior it to run "--info" on the specified Debian package
|
||||
# ACTION is one of the option accepted by dpkg-deb
|
||||
function(run_dpkgdeb dpkg_deb_output)
|
||||
set(${dpkg_deb_output} "" PARENT_SCOPE)
|
||||
|
||||
@@ -404,7 +404,7 @@ if(CPackGen MATCHES "RPM")
|
||||
elseif("${symlink_name}" STREQUAL "symlink_other_relocatable_path"
|
||||
OR "${symlink_name}" STREQUAL "symlink_from_non_relocatable_path"
|
||||
OR "${symlink_name}" STREQUAL "symlink_relocatable_subpath")
|
||||
# these links were not canged - post install script only - ignore them
|
||||
# these links were not changed - post install script only - ignore them
|
||||
else()
|
||||
message(FATAL_ERROR "error: unexpected rpm symbolic link '${check_symlink}'")
|
||||
endif()
|
||||
|
||||
@@ -583,6 +583,6 @@ set_target_properties(mac_fw PROPERTIES
|
||||
add_custom_command(OUTPUT mac_fw.txt COMMAND ${CMAKE_COMMAND} -E touch mac_fw.txt DEPENDS mac_fw)
|
||||
add_custom_target(drive_mac_fw ALL DEPENDS mac_fw.txt)
|
||||
|
||||
# Test empty COMMANDs are ommited
|
||||
# Test empty COMMANDs are omitted
|
||||
add_executable(empty_command empty_command.cxx)
|
||||
add_custom_command(TARGET empty_command POST_BUILD COMMAND $<0:date>)
|
||||
|
||||
@@ -24,7 +24,7 @@ find_package(VTK QUIET)
|
||||
|
||||
add_executable(FindPackageTest FindPackageTest.cxx)
|
||||
|
||||
# test behaviour of cmFindBase wrt. the CMAKE_PREFIX_PATH variable
|
||||
# test behavior of cmFindBase wrt. the CMAKE_PREFIX_PATH variable
|
||||
# foo.h should be found in ${CMAKE_CURRENT_SOURCE_DIR}/include:
|
||||
|
||||
set(CMAKE_PREFIX_PATH /blub /blah "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
@@ -13,7 +13,7 @@ function(run_single_config_test label config exclude_from_all_value expectation)
|
||||
run_cmake_command(${case}-build ${CMAKE_COMMAND} --build . --config ${config})
|
||||
endfunction()
|
||||
|
||||
run_single_config_test("explictly not excluded" Debug 0 "should_exist")
|
||||
run_single_config_test("explicitly not excluded" Debug 0 "should_exist")
|
||||
run_single_config_test("excluded" Debug 1 "should_not_exist")
|
||||
|
||||
if(RunCMake_GENERATOR MATCHES "^(Xcode|Visual Studio)")
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
include(ExternalProject)
|
||||
|
||||
# Verify COMMAND keyword is recognised after various *_COMMAND options
|
||||
# Verify COMMAND keyword is recognized after various *_COMMAND options
|
||||
ExternalProject_Add(multiCommand
|
||||
DOWNLOAD_COMMAND "${CMAKE_COMMAND}" -E echo "download 1"
|
||||
COMMAND "${CMAKE_COMMAND}" -E echo "download 2"
|
||||
|
||||
@@ -7,4 +7,4 @@ CMake Error at CMakeLists.txt:[0-9]+ \(project\):
|
||||
|
||||
buildsystem=bad
|
||||
|
||||
value is unkonwn. It must be '1' or '12'\.$
|
||||
value is unknown. It must be '1' or '12'\.$
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
// Note: GoogleTestXML.cmake doesn't actually depend on Google Test as such;
|
||||
// it only mimicks the output file creation using the path passed to this
|
||||
// it only mimics the output file creation using the path passed to this
|
||||
// test without any content
|
||||
for (int i = 0; i < argc; i++) {
|
||||
std::string param(argv[i]);
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
-- Immediate Message: cancelCall='cmake_language;DEFER;CANCEL_CALL;toBeCancelled'
|
||||
-- Immediate Message: getCallIds2='cmake_language;DEFER;GET_CALL_IDS;ids'
|
||||
-- Immediate Message: messageIds2='cmake_language;EVAL;CODE;message\(STATUS "Deferred Message: ids='\${ids}'"\)'
|
||||
-- Immediate Message: toBeCancelled='message;STATUS;Cancelled Message'
|
||||
-- Immediate Message: toBeCancelled='message;STATUS;Canceled Message'
|
||||
-- Immediate Message: message3='message;STATUS;Final Deferred Message'
|
||||
-- First Deferred Message
|
||||
-- Deferred Message: ids='messageIds1;cancelCall;getCallIds2;messageIds2;toBeCancelled;message3'
|
||||
|
||||
@@ -4,7 +4,7 @@ cmake_language(DEFER ID messageIds1 CALL cmake_language EVAL CODE [[message(STAT
|
||||
cmake_language(DEFER ID cancelCall CALL cmake_language DEFER CANCEL_CALL toBeCancelled)
|
||||
cmake_language(DEFER ID getCallIds2 CALL cmake_language DEFER GET_CALL_IDS ids)
|
||||
cmake_language(DEFER ID messageIds2 CALL cmake_language EVAL CODE [[message(STATUS "Deferred Message: ids='${ids}'")]])
|
||||
cmake_language(DEFER ID toBeCancelled CALL message STATUS "Cancelled Message")
|
||||
cmake_language(DEFER ID toBeCancelled CALL message STATUS "Canceled Message")
|
||||
cmake_language(DEFER ID message3 CALL message STATUS "Final Deferred Message")
|
||||
cmake_language(DEFER GET_CALL_IDS ids)
|
||||
message(STATUS "Immediate Message: ids='${ids}'")
|
||||
|
||||
@@ -55,9 +55,9 @@ function(run_cmake_EDIT_RPATH_only case)
|
||||
else()
|
||||
# Sanity check against a platform known to be ELF-based
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
message(FATAL_ERROR "Expected platform Linux to advertize itself as ELF-based, but it did not.")
|
||||
message(FATAL_ERROR "Expected platform Linux to advertise itself as ELF-based, but it did not.")
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "AIX")
|
||||
message(FATAL_ERROR "Expected platform AIX to advertize itself as XCOFF-based, but it did not.")
|
||||
message(FATAL_ERROR "Expected platform AIX to advertise itself as XCOFF-based, but it did not.")
|
||||
else()
|
||||
message(STATUS "${case} - SKIPPED (No ELF-based platform found)")
|
||||
endif()
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
# "component". For each component, all the headers will be scanned to
|
||||
# determine the components it depends upon by following all the
|
||||
# possible includes from this component. This is to match the
|
||||
# behaviour of autolinking.
|
||||
# behavior of autolinking.
|
||||
|
||||
# Written by Roger Leigh <rleigh@codelibre.net>
|
||||
|
||||
@@ -86,7 +86,7 @@ function(_Boost_FIND_COMPONENT_DEPENDENCIES component includedir _ret_libs)
|
||||
set(library_component TRUE)
|
||||
set(_boost_unprocessed_headers "${BOOST_DIR}/test/test_exec_monitor.hpp")
|
||||
else()
|
||||
# Default behaviour where header directory is the same as the library name.
|
||||
# Default behavior where header directory is the same as the library name.
|
||||
file(GLOB_RECURSE _boost_unprocessed_headers
|
||||
RELATIVE "${includedir}"
|
||||
"${includedir}/boost/${component}/*")
|
||||
|
||||
@@ -89,7 +89,7 @@ readonly basehash_regex="$name $regex_date ([0-9a-f]*)"
|
||||
# Check for an empty destination directory on disk. By checking on disk and
|
||||
# not in the repo it allows a library to be freshly re-inialized in a single
|
||||
# commit rather than first deleting the old copy in one commit and adding the
|
||||
# new copy in a seperate commit.
|
||||
# new copy in a separate commit.
|
||||
if [ ! -d "$(git rev-parse --show-toplevel)/$subtree" ]; then
|
||||
readonly basehash=""
|
||||
else
|
||||
|
||||
@@ -20,7 +20,7 @@ from pygments.lexer import bygroups
|
||||
# - [\.\+-] are needed for string constants like gtk+-2.0
|
||||
# - Unix paths are recognized by '/'; support for Windows paths may be added if needed
|
||||
# - (\\.) allows for \-escapes (used in manual/cmake-language.7)
|
||||
# - $<..$<..$>..> nested occurence in cmake-buildsystem
|
||||
# - $<..$<..$>..> nested occurrence in cmake-buildsystem
|
||||
# - Nested variable evaluations are only supported in a limited capacity. Only
|
||||
# one level of nesting is supported and at most one nested variable can be present.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user