diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeSystemSpecificInitialize.cmake | 2 | ||||
| -rw-r--r-- | Modules/CPackDeb.cmake | 2 | ||||
| -rw-r--r-- | Modules/CPackNuGet.cmake | 12 | ||||
| -rw-r--r-- | Modules/ExternalProject.cmake | 8 | ||||
| -rw-r--r-- | Modules/FindCUDA.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindMatlab.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindPython/Support.cmake | 6 |
7 files changed, 17 insertions, 17 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 29d4296..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. @@ -63,8 +63,8 @@ List of CPackNuGet specific variables: - ``CPACK_COMPONENT_GROUP_<groupName>_DESCRIPTION``, - :variable:`CPACK_PACKAGE_DESCRIPTION` - .. variable:: CPACK_NUGET_PACKAGE_AUTHORS - CPACK_NUGET_<compName>_PACKAGE_AUTHORS +.. variable:: CPACK_NUGET_PACKAGE_AUTHORS + CPACK_NUGET_<compName>_PACKAGE_AUTHORS A comma-separated list of packages authors, matching the profile names on nuget.org_. These are displayed in the NuGet Gallery on @@ -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/ExternalProject.cmake b/Modules/ExternalProject.cmake index db19691..0c5b33f 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -133,9 +133,9 @@ External Project Definition is determined by inspecting the actual content rather than using logic based on the file extension. - ``URL_HASH ALGO=<value>`` - Hash of the archive file to be downloaded. The ``<value>`` should be of - the form ``algo=hashValue`` where ``algo`` can be any of the hashing + ``URL_HASH <algo>=<hashValue>`` + Hash of the archive file to be downloaded. The argument should be of + the form ``<algo>=<hashValue>`` where ``algo`` can be any of the hashing algorithms supported by the :command:`file()` command. Specifying this option is strongly recommended for URL downloads, as it ensures the integrity of the downloaded content. It is also used as a check for a @@ -1686,7 +1686,7 @@ function(_ep_command_line_to_initial_cache var args force) foreach(line ${args}) if("${line}" MATCHES "^-D(.*)") set(line "${CMAKE_MATCH_1}") - if(setArg) + if(NOT "${setArg}" STREQUAL "") # This is required to build up lists in variables, or complete an entry string(APPEND setArg "${accumulator}\" CACHE ${type} \"Initial cache\" ${forceArg})") string(APPEND script_initial_cache "\n${setArg}") 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() |