diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeVerifyManifest.cmake | 8 | ||||
| -rw-r--r-- | Modules/CPackRPM.cmake | 2 | ||||
| -rw-r--r-- | Modules/ExternalProject.cmake | 6 | ||||
| -rw-r--r-- | Modules/FindCUDA.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindJava.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindMatlab.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindPNG.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindSDL_image.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindSDL_mixer.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindSDL_net.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindSDL_ttf.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindSubversion.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindThreads.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/GHS-MULTI-Initialize.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 2 | ||||
| -rw-r--r-- | Modules/UseJava.cmake | 2 |
16 files changed, 27 insertions, 27 deletions
diff --git a/Modules/CMakeVerifyManifest.cmake b/Modules/CMakeVerifyManifest.cmake index bff4e1e..a54b9d2 100644 --- a/Modules/CMakeVerifyManifest.cmake +++ b/Modules/CMakeVerifyManifest.cmake @@ -6,18 +6,18 @@ # # 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 # 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 # 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 # found in the .manifest file. # This script first recursively globs *.manifest files from # 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 # from the first glob. @@ -54,7 +54,7 @@ function(crt_version file list_var) endif() endforeach() if(NOT DEFINED has_match) - message("Information: no embeded manifest in: ${file}") + message("Information: no embedded manifest in: ${file}") return() endif() list(APPEND version_list ${${list_var}}) diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index ae51dc1..8011346 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -23,7 +23,7 @@ # # .. 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) # as is with other `CPACK_<COMPONENT>_XXXX` variables. # For the purposes of back compatibility (CMake/CPack version 3.5 and lower) diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 249658d..1078b81 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -113,7 +113,7 @@ Create custom targets to build projects in external trees ``CMAKE_CACHE_ARGS <arg>...`` Initial cache arguments, of the form ``-Dvar:string=on``. 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. These arguments are :command:`set` using the ``FORCE`` argument, and therefore cannot be changed by the user. @@ -122,7 +122,7 @@ Create custom targets to build projects in external trees ``CMAKE_CACHE_DEFAULT_ARGS <arg>...`` Initial default cache arguments, of the form ``-Dvar:string=on``. 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. 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 @@ -238,7 +238,7 @@ Create custom targets to build projects in external trees If ``UPDATE_DISCONNECTED`` is set, the update step is not executed 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 - 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). This is disabled by default. The directory property ``EP_UPDATE_DISCONNECTED`` can be used to change diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index fe8b18e..4f52d25 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -81,7 +81,7 @@ # --compiler-bindir is already present in the CUDA_NVCC_FLAGS or # CUDA_NVCC_FLAGS_<CONFIG> variables. For Visual Studio targets # $(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_<CONFIG> @@ -215,7 +215,7 @@ # The arguments passed in after OPTIONS are extra command line options to # give to nvcc. You can also specify per configuration options by # 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. # # OPTIONS -DFLAG=2 "-DFLAG_OTHER=space in flag" diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index cc67df6..c643d9b 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -26,7 +26,7 @@ # Java_JAVA_EXECUTABLE = the full path to the Java runtime # Java_JAVAC_EXECUTABLE = the full path to the Java compiler # 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_JAR_EXECUTABLE = the full path to the Java archiver # Java_JARSIGNER_EXECUTABLE = the full path to the Java jar signer diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 7a36719..8aa0c11 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -132,7 +132,7 @@ # useful for the searching all possible Matlab installation. # :command:`matlab_get_mex_suffix` # returns the suffix to be used for the mex files -# (platform/architecture dependant) +# (platform/architecture dependent) # :command:`matlab_get_version_from_matlab_run` # returns the version of Matlab, given the full directory of the Matlab # program. diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index cae41ac..5050d91 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -85,7 +85,7 @@ if(ZLIB_FOUND) list(APPEND PNG_NAMES_DEBUG png${v}d libpng${v}d) endforeach() 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. if(NOT PNG_LIBRARY) find_library(PNG_LIBRARY_RELEASE NAMES ${PNG_NAMES}) @@ -104,7 +104,7 @@ if(ZLIB_FOUND) if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR) # png.h includes zlib.h. Sigh. 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}) if (CYGWIN) diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake index 49b5e40..e7517c5 100644 --- a/Modules/FindSDL_image.cmake +++ b/Modules/FindSDL_image.cmake @@ -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 VERSION_VAR SDL_IMAGE_VERSION_STRING) -# for backward compatiblity +# for backward compatibility set(SDLIMAGE_LIBRARY ${SDL_IMAGE_LIBRARIES}) set(SDLIMAGE_INCLUDE_DIR ${SDL_IMAGE_INCLUDE_DIRS}) set(SDLIMAGE_FOUND ${SDL_IMAGE_FOUND}) diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake index 9e11796..72ec654 100644 --- a/Modules/FindSDL_mixer.cmake +++ b/Modules/FindSDL_mixer.cmake @@ -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 VERSION_VAR SDL_MIXER_VERSION_STRING) -# for backward compatiblity +# for backward compatibility set(SDLMIXER_LIBRARY ${SDL_MIXER_LIBRARIES}) set(SDLMIXER_INCLUDE_DIR ${SDL_MIXER_INCLUDE_DIRS}) set(SDLMIXER_FOUND ${SDL_MIXER_FOUND}) diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake index ef23573..11c250c 100644 --- a/Modules/FindSDL_net.cmake +++ b/Modules/FindSDL_net.cmake @@ -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 VERSION_VAR SDL_NET_VERSION_STRING) -# for backward compatiblity +# for backward compatibility set(SDLNET_LIBRARY ${SDL_NET_LIBRARIES}) set(SDLNET_INCLUDE_DIR ${SDL_NET_INCLUDE_DIRS}) set(SDLNET_FOUND ${SDL_NET_FOUND}) diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake index 4b527fa..38f6e1d 100644 --- a/Modules/FindSDL_ttf.cmake +++ b/Modules/FindSDL_ttf.cmake @@ -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 VERSION_VAR SDL_TTF_VERSION_STRING) -# for backward compatiblity +# for backward compatibility set(SDLTTF_LIBRARY ${SDL_TTF_LIBRARIES}) set(SDLTTF_INCLUDE_DIR ${SDL_TTF_INCLUDE_DIRS}) set(SDLTTF_FOUND ${SDL_TTF_FOUND}) diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake index 0d13318..804f44c 100644 --- a/Modules/FindSubversion.cmake +++ b/Modules/FindSubversion.cmake @@ -11,7 +11,7 @@ # Subversion_SVN_EXECUTABLE - path to 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 - same as Subversion_FOUND, set for compatiblity reasons +# SUBVERSION_FOUND - same as Subversion_FOUND, set for compatibility reasons # # # diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index c607923..719dace 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -26,7 +26,7 @@ # # 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 # # :: diff --git a/Modules/Platform/GHS-MULTI-Initialize.cmake b/Modules/Platform/GHS-MULTI-Initialize.cmake index 9eb7a8a..6e6b4ff 100644 --- a/Modules/Platform/GHS-MULTI-Initialize.cmake +++ b/Modules/Platform/GHS-MULTI-Initialize.cmake @@ -15,7 +15,7 @@ #Setup Greenhills MULTI specific compilation information 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") if (EXISTS ${GHS_EXPECTED_ROOT}) FILE(GLOB GHS_CANDIDATE_INT_DIRS RELATIVE diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 26bf11c..deaa88e 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -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}") 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. 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}") diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index 475ad5e..3850890 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -324,7 +324,7 @@ # that allow your Java and C code to interact. # # 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: # # :: # |