summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-06-05 15:26:04 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-06-05 15:26:12 (GMT)
commit8dbccd050c347dacbc4a40ace6253b0c61db86b6 (patch)
tree0a7a0a46eabcd0f7a469e64ee35f27e81bbc4634 /Modules
parent054bc6a330316f96f1398fa511cd4a7bd66c89a6 (diff)
parentbe281068806891f725fa82583ffb97112872f618 (diff)
downloadCMake-8dbccd050c347dacbc4a40ace6253b0c61db86b6.zip
CMake-8dbccd050c347dacbc4a40ace6253b0c61db86b6.tar.gz
CMake-8dbccd050c347dacbc4a40ace6253b0c61db86b6.tar.bz2
Merge topic 'more-misc-typos'
be28106880 Fix misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !2130
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeSystemSpecificInitialize.cmake2
-rw-r--r--Modules/CPackDeb.cmake2
-rw-r--r--Modules/CPackNuGet.cmake8
-rw-r--r--Modules/FindCUDA.cmake2
-rw-r--r--Modules/FindMatlab.cmake2
-rw-r--r--Modules/FindPython/Support.cmake6
6 files changed, 11 insertions, 11 deletions
diff --git a/Modules/CMakeSystemSpecificInitialize.cmake b/Modules/CMakeSystemSpecificInitialize.cmake
index de4d7f5..21bcd40 100644
--- a/Modules/CMakeSystemSpecificInitialize.cmake
+++ b/Modules/CMakeSystemSpecificInitialize.cmake
@@ -15,7 +15,7 @@
# An example are the platforms supported by Xcode (macOS, iOS, tvOS,
# and watchOS). For all of those the CMAKE_EFFECTIVE_SYSTEM_NAME is
# set to Apple which results in using
-# Platfom/Apple-AppleClang-CXX.cmake for the Apple C++ compiler.
+# Platform/Apple-AppleClang-CXX.cmake for the Apple C++ compiler.
set(CMAKE_EFFECTIVE_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
include(Platform/${CMAKE_SYSTEM_NAME}-Initialize OPTIONAL)
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 067e290..fdbae32 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -1031,7 +1031,7 @@ function(cpack_deb_prepare_package_vars)
"CPACK_DEBIAN_FILE_NAME")
if(CPACK_DEBIAN_FILE_NAME)
if(CPACK_DEBIAN_FILE_NAME STREQUAL "DEB-DEFAULT")
- # Patch package file name to be in corrent debian format:
+ # Patch package file name to be in correct debian format:
# <foo>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb
set(CPACK_OUTPUT_FILE_NAME
"${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
diff --git a/Modules/CPackNuGet.cmake b/Modules/CPackNuGet.cmake
index a3edd75..05403bc 100644
--- a/Modules/CPackNuGet.cmake
+++ b/Modules/CPackNuGet.cmake
@@ -5,7 +5,7 @@
CPackNuGet
----------
-When build a NuGet pacakge there is no direct way to control an output
+When build a NuGet package there is no direct way to control an output
filename due a lack of the corresponding CLI option of NuGet, so there
is no ``CPACK_NUGET_PACKAGE_FILENAME`` variable. To form the output filename
NuGet uses the package name and the version according to its built-in rules.
@@ -509,7 +509,7 @@ else()
if(CPACK_NUGET_GROUPS)
_cpack_nuget_debug("---[Making grouped component(s) package(s)]---")
foreach(_group IN LISTS CPACK_NUGET_GROUPS)
- _cpack_nuget_debug("Starting to make the pacakge for group `${_group}`")
+ _cpack_nuget_debug("Starting to make the package for group `${_group}`")
string(MAKE_C_IDENTIFIER "${_group}" _group_up)
string(TOUPPER "${_group_up}" _group_up)
@@ -531,11 +531,11 @@ else()
if(CPACK_NUGET_COMPONENTS)
_cpack_nuget_debug("---[Making single-component(s) package(s)]---")
foreach(_comp IN LISTS CPACK_NUGET_COMPONENTS)
- _cpack_nuget_debug("Starting to make the pacakge for component `${_comp}`")
+ _cpack_nuget_debug("Starting to make the package for component `${_comp}`")
# Render a spec file which includes only given component
unset(_CPACK_NUGET_FILES_TAG)
_cpack_nuget_make_files_tag(${_comp})
- # Temporary set `CPACK_NUGET_PACKAGE_COMPONENT` to the the current
+ # Temporary set `CPACK_NUGET_PACKAGE_COMPONENT` to the current
# component name to properly collect various per group settings
set(CPACK_NUGET_PACKAGE_COMPONENT ${_comp})
_cpack_nuget_render_spec()
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 874fb89..21cace3 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -569,7 +569,7 @@ else()
endif()
# Propagate the host flags to the host compiler via -Xcompiler
-option(CUDA_PROPAGATE_HOST_FLAGS "Propage C/CXX_FLAGS and friends to the host compiler via -Xcompile" ON)
+option(CUDA_PROPAGATE_HOST_FLAGS "Propagate C/CXX_FLAGS and friends to the host compiler via -Xcompile" ON)
# Enable CUDA_SEPARABLE_COMPILATION
option(CUDA_SEPARABLE_COMPILATION "Compile CUDA objects with separable compilation enabled. Requires CUDA 5.0+" OFF)
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index b03f793..54e62db 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -591,7 +591,7 @@ function(matlab_get_mex_suffix matlab_root mex_suffix)
set(devnull INPUT_FILE NUL)
endif()
- # this is the prefered way. If this does not work properly (eg. MCR on Windows), then we use our own knowledge
+ # this is the preferred way. If this does not work properly (eg. MCR on Windows), then we use our own knowledge
execute_process(
COMMAND ${Matlab_MEXEXTENSIONS_PROG}
OUTPUT_VARIABLE _matlab_mex_extension
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 9903a6d..ddbd607 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -290,7 +290,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
if (${_PYTHON_PREFIX}_EXECUTABLE
AND ${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
set (${_PYTHON_PREFIX}_Interpreter_FOUND TRUE)
- # Use interpreter version for future searchs to ensure consistency
+ # Use interpreter version for future searches to ensure consistency
set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
endif()
@@ -418,7 +418,7 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
endif()
elseif (${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
set (${_PYTHON_PREFIX}_Compiler_FOUND TRUE)
- # Use compiler version for future searchs to ensure consistency
+ # Use compiler version for future searches to ensure consistency
set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
endif()
endif()
@@ -774,7 +774,7 @@ if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
if ((${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
AND ${_PYTHON_PREFIX}_INCLUDE_DIR)
if (${_PYTHON_PREFIX}_Interpreter_FOUND OR ${_PYTHON_PREFIX}_Compiler_FOUND)
- # devlopment environment must be compatible with interpreter/compiler
+ # development environment must be compatible with interpreter/compiler
if (${_${_PYTHON_PREFIX}_VERSION_MAJOR}.${_${_PYTHON_PREFIX}_VERSION_MINOR} VERSION_EQUAL ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
set (${_PYTHON_PREFIX}_Development_FOUND TRUE)
endif()