diff options
69 files changed, 286 insertions, 182 deletions
diff --git a/Help/command/add_executable.rst b/Help/command/add_executable.rst index 8b3fb57..19ca658 100644 --- a/Help/command/add_executable.rst +++ b/Help/command/add_executable.rst @@ -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 ``ALIAS``. ``ALIAS`` targets can be used as targets to read properties 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 is, it may not be used as the operand of :command:`set_property`, :command:`set_target_properties`, :command:`target_link_libraries` etc. diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst index 5033e18..36adcbe 100644 --- a/Help/command/add_library.rst +++ b/Help/command/add_library.rst @@ -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>`` may not be an :ref:`Imported Target <Imported Targets>` or an ``ALIAS``. ``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 to modify properties of ``<target>``, that is, it may not be used as the operand of :command:`set_property`, :command:`set_target_properties`, diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst index 9004bb2..07bf33f 100644 --- a/Help/manual/cmake-buildsystem.7.rst +++ b/Help/manual/cmake-buildsystem.7.rst @@ -150,7 +150,7 @@ and :prop_tgt:`INTERFACE_COMPILE_OPTIONS` target properties. Each of the commands has a ``PRIVATE``, ``PUBLIC`` and ``INTERFACE`` mode. The ``PRIVATE`` mode populates only the non-``INTERFACE_`` variant of the target 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: .. code-block:: cmake diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 13ee4bd..d4f47dd 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -225,7 +225,7 @@ comparison:: -I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I> 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 property is non-empty:: diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index aebc5d9..c27c612 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -645,7 +645,7 @@ Disabling the Package Registry ------------------------------ 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 :command:`export(PACKAGE)` command. diff --git a/Help/manual/cpack.1.rst b/Help/manual/cpack.1.rst index ba2086e..4f9f28d 100644 --- a/Help/manual/cpack.1.rst +++ b/Help/manual/cpack.1.rst @@ -65,7 +65,7 @@ Options ``-P <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 ``-R <package version>`` diff --git a/Help/prop_dir/INCLUDE_DIRECTORIES.rst b/Help/prop_dir/INCLUDE_DIRECTORIES.rst index baba49b..6789a56 100644 --- a/Help/prop_dir/INCLUDE_DIRECTORIES.rst +++ b/Help/prop_dir/INCLUDE_DIRECTORIES.rst @@ -13,7 +13,7 @@ directories for the compiler. In addition to accepting values from that command, values may be set directly on any directory using the :command:`set_property` command. A 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 values are adjusted by calls to the :command:`include_directories` command. diff --git a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst index 3db4f18..e8f4d2a 100644 --- a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst +++ b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst @@ -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 ``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 diff --git a/Help/prop_tgt/COMPILE_OPTIONS.rst b/Help/prop_tgt/COMPILE_OPTIONS.rst index 36d786a..892ac23 100644 --- a/Help/prop_tgt/COMPILE_OPTIONS.rst +++ b/Help/prop_tgt/COMPILE_OPTIONS.rst @@ -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` 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 the options for the compiler. diff --git a/Help/prop_tgt/JOB_POOL_LINK.rst b/Help/prop_tgt/JOB_POOL_LINK.rst index 716f53f..6535333 100644 --- a/Help/prop_tgt/JOB_POOL_LINK.rst +++ b/Help/prop_tgt/JOB_POOL_LINK.rst @@ -5,7 +5,7 @@ Ninja only: Pool used for linking. The number of parallel link processes could be limited by defining 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: diff --git a/Help/release/dev/CMakePushCheckState-CMAKE_EXTRA_INCLUDE_FILES.rst b/Help/release/dev/CMakePushCheckState-CMAKE_EXTRA_INCLUDE_FILES.rst new file mode 100644 index 0000000..a4e9a14 --- /dev/null +++ b/Help/release/dev/CMakePushCheckState-CMAKE_EXTRA_INCLUDE_FILES.rst @@ -0,0 +1,5 @@ +CMakePushCheckState-CMAKE_EXTRA_INCLUDE_FILE +-------------------------------------------- + +* The :module:`CMakePushCheckState` module now pushes/pops/resets the variable + ``CMAKE_EXTRA_INCLUDE_FILE`` used in :module:`CheckTypeSize`. diff --git a/Help/release/dev/cpack-rpm-upper-cased-components.rst b/Help/release/dev/cpack-rpm-upper-cased-components.rst index a5fb233..0628170 100644 --- a/Help/release/dev/cpack-rpm-upper-cased-components.rst +++ b/Help/release/dev/cpack-rpm-upper-cased-components.rst @@ -9,7 +9,7 @@ cpack-rpm-upper-cased-components Upper cased component name part in variables is compatible with convention used for other CPack variables. 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. New variables that will be added to CPackRPM in later versions will only support upper cased component variable format. diff --git a/Help/release/dev/external-project-no-extract.rst b/Help/release/dev/external-project-no-extract.rst new file mode 100644 index 0000000..b3293cd --- /dev/null +++ b/Help/release/dev/external-project-no-extract.rst @@ -0,0 +1,6 @@ +external-project-no-extract +--------------------------- + +* The :module:`ExternalProject` module leared the ``DOWNLOAD_NO_EXTRACT 1`` + argument to skip extracting the file that is downloaded (e.g., for + self-extracting shell installers or ``.msi`` files). diff --git a/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst b/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst index 8bb7cc0..5be935b 100644 --- a/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst +++ b/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst @@ -3,7 +3,7 @@ CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN 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 to specify the location of such tools. ``CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN`` may be set to a path to a path to diff --git a/Help/variable/CTEST_COVERAGE_COMMAND.rst b/Help/variable/CTEST_COVERAGE_COMMAND.rst index 0491d42..a78792e 100644 --- a/Help/variable/CTEST_COVERAGE_COMMAND.rst +++ b/Help/variable/CTEST_COVERAGE_COMMAND.rst @@ -54,7 +54,7 @@ program requires some named arguments. file format to write output in: xml or html 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. .. _`Cobertura`: http://cobertura.github.io/cobertura/ diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake index 07d8b1e..a350a84 100644 --- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake +++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake @@ -24,6 +24,7 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR) FAIL_REGEX "[Uu]nrecogni[sz]ed .*option" # GNU, NAG FAIL_REGEX "unknown .*option" # Clang FAIL_REGEX "optimization flag .* not supported" # Clang + FAIL_REGEX "unknown argument ignored" # Clang (cl) FAIL_REGEX "ignoring unknown option" # MSVC, Intel FAIL_REGEX "warning D9002" # MSVC, any lang FAIL_REGEX "option.*not supported" # Intel diff --git a/Modules/CMakePushCheckState.cmake b/Modules/CMakePushCheckState.cmake index bf4ec0e..6958da1 100644 --- a/Modules/CMakePushCheckState.cmake +++ b/Modules/CMakePushCheckState.cmake @@ -8,8 +8,8 @@ # CMAKE_POP_CHECK_STATE() and CMAKE_RESET_CHECK_STATE() These macros can # be used to save, restore and reset (i.e., clear contents) the state of # the variables CMAKE_REQUIRED_FLAGS, CMAKE_REQUIRED_DEFINITIONS, -# CMAKE_REQUIRED_LIBRARIES and CMAKE_REQUIRED_INCLUDES used by the -# various Check-files coming with CMake, like e.g. +# CMAKE_REQUIRED_LIBRARIES, CMAKE_REQUIRED_INCLUDES and CMAKE_EXTRA_INCLUDE_FILES +# used by the various Check-files coming with CMake, like e.g. # check_function_exists() etc. The variable contents are pushed on a # stack, pushing multiple times is supported. This is useful e.g. when # executing such tests in a Find-module, where they have to be set, but @@ -49,6 +49,7 @@ macro(CMAKE_RESET_CHECK_STATE) + set(CMAKE_EXTRA_INCLUDE_FILES) set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_DEFINITIONS) set(CMAKE_REQUIRED_LIBRARIES) @@ -65,6 +66,7 @@ macro(CMAKE_PUSH_CHECK_STATE) math(EXPR _CMAKE_PUSH_CHECK_STATE_COUNTER "${_CMAKE_PUSH_CHECK_STATE_COUNTER}+1") + set(_CMAKE_EXTRA_INCLUDE_FILES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_EXTRA_INCLUDE_FILES}) set(_CMAKE_REQUIRED_INCLUDES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_INCLUDES}) set(_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_DEFINITIONS}) set(_CMAKE_REQUIRED_LIBRARIES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_LIBRARIES}) @@ -82,6 +84,7 @@ macro(CMAKE_POP_CHECK_STATE) # don't pop more than we pushed if("${_CMAKE_PUSH_CHECK_STATE_COUNTER}" GREATER "0") + set(CMAKE_EXTRA_INCLUDE_FILES ${_CMAKE_EXTRA_INCLUDE_FILES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) set(CMAKE_REQUIRED_INCLUDES ${_CMAKE_REQUIRED_INCLUDES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) set(CMAKE_REQUIRED_DEFINITIONS ${_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) set(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) 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 713b938..768d64f 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 249658d6..1185a81 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -77,6 +77,9 @@ Create custom targets to build projects in external trees Path to a certificate authority file ``TIMEOUT <seconds>`` Time allowed for file download operations + ``DOWNLOAD_NO_EXTRACT 1`` + Just download the file and do not extract it; the full path to the + downloaded file is available as ``<DOWNLOADED_FILE>``. Update/Patch step options are: @@ -113,7 +116,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 +125,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 +241,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 @@ -1107,7 +1110,7 @@ macro(_ep_replace_location_tags target_name) set(vars ${ARGN}) foreach(var ${vars}) if(${var}) - foreach(dir SOURCE_DIR BINARY_DIR INSTALL_DIR TMP_DIR) + foreach(dir SOURCE_DIR BINARY_DIR INSTALL_DIR TMP_DIR DOWNLOADED_FILE) get_property(val TARGET ${target_name} PROPERTY _EP_${dir}) string(REPLACE "<${dir}>" "${val}" ${var} "${${var}}") endforeach() @@ -1875,6 +1878,7 @@ function(_ep_add_download_command name) set(cmd ${CMAKE_COMMAND} -E remove_directory ${source_dir} COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir}) else() + get_property(no_extract TARGET "${name}" PROPERTY _EP_DOWNLOAD_NO_EXTRACT SET) if("${url}" MATCHES "^[a-z]+://") # TODO: Should download and extraction be different steps? if("x${fname}" STREQUAL "x") @@ -1884,7 +1888,9 @@ function(_ep_add_download_command name) string(REGEX MATCH "([^/\\?]+(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip))/.*$" match_result "${url}") set(fname "${CMAKE_MATCH_1}") endif() - if(NOT "${fname}" MATCHES "(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$") + if (no_extract) + get_filename_component(fname "${url}" NAME) + elseif(NOT "${fname}" MATCHES "(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$") message(FATAL_ERROR "Could not extract tarball filename from url:\n ${url}") endif() string(REPLACE ";" "-" fname "${fname}") @@ -1898,16 +1904,30 @@ function(_ep_add_download_command name) set(cmd ${CMAKE_COMMAND} -P "${download_script}" COMMAND) set(retries 3) - set(comment "Performing download step (download, verify and extract) for '${name}'") + if (no_extract) + set(steps "download and verify") + else () + set(steps "download, verify and extract") + endif () + set(comment "Performing download step (${steps}) for '${name}'") else() set(file "${url}") - set(comment "Performing download step (verify and extract) for '${name}'") + if (no_extract) + set(steps "verify") + else () + set(steps "verify and extract") + endif () + set(comment "Performing download step (${steps}) for '${name}'") endif() _ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${hash}" "${retries}" "${download_script}") list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake COMMAND) - _ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${name}" "${file}" "${source_dir}") - list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake) + if (NOT no_extract) + _ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${name}" "${file}" "${source_dir}") + list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake) + else () + set_property(TARGET ${name} PROPERTY _EP_DOWNLOADED_FILE ${file}) + endif () endif() else() _ep_is_dir_empty("${source_dir}" empty) 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: # # :: # diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9ccf7a8..0214250 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 5) -set(CMake_VERSION_PATCH 20160331) +set(CMake_VERSION_PATCH 20160401) #set(CMake_VERSION_RC 1) diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx index 587b583..eb18b70 100644 --- a/Source/CTest/cmCTestBZR.cxx +++ b/Source/CTest/cmCTestBZR.cxx @@ -80,7 +80,7 @@ cmCTestBZR::cmCTestBZR(cmCTest* ct, std::ostream& log): cmCTestGlobalVC(ct, log) { 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. // Since it doesn't hurt, we specify this environment variable. cmSystemTools::PutEnv("BZR_PROGRESS_BAR=none"); diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx index 6eb15c1..1c832dd 100644 --- a/Source/CursesDialog/cmCursesStringWidget.cxx +++ b/Source/CursesDialog/cmCursesStringWidget.cxx @@ -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 ) ) { return false; diff --git a/Source/CursesDialog/form/fld_def.c b/Source/CursesDialog/form/fld_def.c index 4a49a25..00da3b4 100644 --- a/Source/CursesDialog/form/fld_def.c +++ b/Source/CursesDialog/form/fld_def.c @@ -73,7 +73,7 @@ FIELD *_nc_Default_Field = &default_field; | int *err ) | | 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. | | 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 | | Return Values : TRUE - copy worked -| FALSE - error occured +| FALSE - error occurred +--------------------------------------------------------------------------*/ bool _nc_Copy_Type(FIELD *dst, FIELD const *src) diff --git a/Source/CursesDialog/form/fld_ftlink.c b/Source/CursesDialog/form/fld_ftlink.c index 1cb80d1..e98a4ca 100644 --- a/Source/CursesDialog/form/fld_ftlink.c +++ b/Source/CursesDialog/form/fld_ftlink.c @@ -46,7 +46,7 @@ MODULE_ID("$Id$") | E_BAD_ARGUMENT - invalid arguments | 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) { diff --git a/Source/CursesDialog/form/fld_newftyp.c b/Source/CursesDialog/form/fld_newftyp.c index b45ebd8..b839f19 100644 --- a/Source/CursesDialog/form/fld_newftyp.c +++ b/Source/CursesDialog/form/fld_newftyp.c @@ -63,7 +63,7 @@ const FIELDTYPE* _nc_Default_FieldType = &default_fieldtype; | E_BAD_ARGUMENT - invalid arguments | 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( bool (* const field_check)(FIELD *,const void *), diff --git a/Source/CursesDialog/form/form.priv.h b/Source/CursesDialog/form/form.priv.h index 8516a6f..6e00af6 100644 --- a/Source/CursesDialog/form/form.priv.h +++ b/Source/CursesDialog/form/form.priv.h @@ -40,7 +40,7 @@ /* field status values */ #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 _MAY_GROW (0x08) /* dynamic field may still grow */ diff --git a/Source/CursesDialog/form/frm_def.c b/Source/CursesDialog/form/frm_def.c index 0b28f5f..645b3ba 100644 --- a/Source/CursesDialog/form/frm_def.c +++ b/Source/CursesDialog/form/frm_def.c @@ -240,7 +240,7 @@ static int Connect_Fields(FORM * form, FIELD ** fields) | If there are fields, position to first active field. | | Return Values : E_OK - success -| any other - error occured +| any other - error occurred +--------------------------------------------------------------------------*/ 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. | -| Return Values : Pointer to form. NULL if error occured. +| Return Values : Pointer to form. NULL if error occurred. +--------------------------------------------------------------------------*/ FORM *new_form(FIELD ** fields) { diff --git a/Source/CursesDialog/form/frm_driver.c b/Source/CursesDialog/form/frm_driver.c index 26f580e..e4e72aa 100644 --- a/Source/CursesDialog/form/frm_driver.c +++ b/Source/CursesDialog/form/frm_driver.c @@ -1676,7 +1676,7 @@ static int VSC_Generic(FORM *form, int lines) | | Description : Performs the generic vertical scrolling routines. | 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 +--------------------------------------------------------------------------*/ @@ -2159,7 +2159,7 @@ static int Wrapping_Not_Necessary_Or_Wrapping_Ok(FORM * form) | | Description : Generic routine for field editing requests. The driver | 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 | of the NEW_LINE and DEL_PREV requests. | diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 6a0ebec..64c5980 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -14,6 +14,33 @@ #include "cmOutputConverter.h" #include "cmAlgorithms.h" +static std::string const keyAND = "AND"; +static std::string const keyCOMMAND = "COMMAND"; +static std::string const keyDEFINED = "DEFINED"; +static std::string const keyEQUAL = "EQUAL"; +static std::string const keyEXISTS = "EXISTS"; +static std::string const keyGREATER = "GREATER"; +static std::string const keyIN_LIST = "IN_LIST"; +static std::string const keyIS_ABSOLUTE = "IS_ABSOLUTE"; +static std::string const keyIS_DIRECTORY = "IS_DIRECTORY"; +static std::string const keyIS_NEWER_THAN = "IS_NEWER_THAN"; +static std::string const keyIS_SYMLINK = "IS_SYMLINK"; +static std::string const keyLESS = "LESS"; +static std::string const keyMATCHES = "MATCHES"; +static std::string const keyNOT = "NOT"; +static std::string const keyOR = "OR"; +static std::string const keyParenL = "("; +static std::string const keyParenR = ")"; +static std::string const keyPOLICY = "POLICY"; +static std::string const keySTREQUAL = "STREQUAL"; +static std::string const keySTRGREATER = "STRGREATER"; +static std::string const keySTRLESS = "STRLESS"; +static std::string const keyTARGET = "TARGET"; +static std::string const keyTEST = "TEST"; +static std::string const keyVERSION_EQUAL = "VERSION_EQUAL"; +static std::string const keyVERSION_GREATER = "VERSION_GREATER"; +static std::string const keyVERSION_LESS = "VERSION_LESS"; + cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile, const cmListFileContext &context, const cmListFileBacktrace& bt): @@ -104,25 +131,6 @@ bool cmConditionEvaluator::IsTrue( errorString, status, true); } -cmListFileContext cmConditionEvaluator::GetConditionContext( - cmMakefile* mf, - const cmCommandContext& command, - const std::string& filePath) -{ - cmListFileContext context = - cmListFileContext::FromCommandContext( - command, - filePath); - - if(!mf->GetCMakeInstance()->GetIsInTryCompile()) - { - cmOutputConverter converter(mf->GetStateSnapshot()); - context.FilePath = converter.Convert(context.FilePath, - cmOutputConverter::HOME); - } - return context; -} - //========================================================================= const char* cmConditionEvaluator::GetDefinitionIfUnquoted( cmExpandedCommandArgument const& argument) const @@ -400,7 +408,7 @@ bool cmConditionEvaluator::HandleLevel0(cmArgumentList &newArgs, cmArgumentList::iterator arg = newArgs.begin(); while (arg != newArgs.end()) { - if (IsKeyword("(", *arg)) + if (IsKeyword(keyParenL, *arg)) { // search for the closing paren for this opening one cmArgumentList::iterator argClose; @@ -409,11 +417,11 @@ bool cmConditionEvaluator::HandleLevel0(cmArgumentList &newArgs, unsigned int depth = 1; while (argClose != newArgs.end() && depth) { - if (this->IsKeyword("(", *argClose)) + if (this->IsKeyword(keyParenL, *argClose)) { depth++; } - if (this->IsKeyword(")", *argClose)) + if (this->IsKeyword(keyParenR, *argClose)) { depth--; } @@ -474,35 +482,35 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs, argP1 = arg; this->IncrementArguments(newArgs,argP1,argP2); // does a file exist - if (this->IsKeyword("EXISTS", *arg) && argP1 != newArgs.end()) + if (this->IsKeyword(keyEXISTS, *arg) && argP1 != newArgs.end()) { this->HandlePredicate( cmSystemTools::FileExists(argP1->c_str()), reducible, arg, newArgs, argP1, argP2); } // does a directory with this name exist - if (this->IsKeyword("IS_DIRECTORY", *arg) && argP1 != newArgs.end()) + if (this->IsKeyword(keyIS_DIRECTORY, *arg) && argP1 != newArgs.end()) { this->HandlePredicate( cmSystemTools::FileIsDirectory(argP1->c_str()), reducible, arg, newArgs, argP1, argP2); } // does a symlink with this name exist - if (this->IsKeyword("IS_SYMLINK", *arg) && argP1 != newArgs.end()) + if (this->IsKeyword(keyIS_SYMLINK, *arg) && argP1 != newArgs.end()) { this->HandlePredicate( cmSystemTools::FileIsSymlink(argP1->c_str()), reducible, arg, newArgs, argP1, argP2); } // is the given path an absolute path ? - if (this->IsKeyword("IS_ABSOLUTE", *arg) && argP1 != newArgs.end()) + if (this->IsKeyword(keyIS_ABSOLUTE, *arg) && argP1 != newArgs.end()) { this->HandlePredicate( cmSystemTools::FileIsFullPath(argP1->c_str()), reducible, arg, newArgs, argP1, argP2); } // does a command exist - if (this->IsKeyword("COMMAND", *arg) && argP1 != newArgs.end()) + if (this->IsKeyword(keyCOMMAND, *arg) && argP1 != newArgs.end()) { cmCommand* command = this->Makefile.GetState()->GetCommand(argP1->c_str()); @@ -511,7 +519,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs, reducible, arg, newArgs, argP1, argP2); } // does a policy exist - if (this->IsKeyword("POLICY", *arg) && argP1 != newArgs.end()) + if (this->IsKeyword(keyPOLICY, *arg) && argP1 != newArgs.end()) { cmPolicies::PolicyID pid; this->HandlePredicate( @@ -519,7 +527,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs, reducible, arg, newArgs, argP1, argP2); } // does a target exist - if (this->IsKeyword("TARGET", *arg) && argP1 != newArgs.end()) + if (this->IsKeyword(keyTARGET, *arg) && argP1 != newArgs.end()) { this->HandlePredicate( this->Makefile.FindTargetToUse(argP1->GetValue())?true:false, @@ -529,7 +537,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs, if(this->Policy64Status != cmPolicies::OLD && this->Policy64Status != cmPolicies::WARN) { - if (this->IsKeyword("TEST", *arg) && argP1 != newArgs.end()) + if (this->IsKeyword(keyTEST, *arg) && argP1 != newArgs.end()) { const cmTest* haveTest = this->Makefile.GetTest(argP1->c_str()); this->HandlePredicate( @@ -538,7 +546,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs, } } else if(this->Policy64Status == cmPolicies::WARN && - this->IsKeyword("TEST", *arg)) + this->IsKeyword(keyTEST, *arg)) { std::ostringstream e; e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0064) << "\n"; @@ -549,7 +557,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs, this->Makefile.IssueMessage(cmake::AUTHOR_WARNING, e.str()); } // is a variable defined - if (this->IsKeyword("DEFINED", *arg) && argP1 != newArgs.end()) + if (this->IsKeyword(keyDEFINED, *arg) && argP1 != newArgs.end()) { size_t argP1len = argP1->GetValue().size(); bool bdef = false; @@ -593,7 +601,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, argP1 = arg; this->IncrementArguments(newArgs,argP1,argP2); if (argP1 != newArgs.end() && argP2 != newArgs.end() && - IsKeyword("MATCHES", *argP1)) + IsKeyword(keyMATCHES, *argP1)) { def = this->GetVariableOrString(*arg); if (def != arg->c_str() // yes, we compare the pointer value @@ -631,7 +639,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, reducible = 1; } - if (argP1 != newArgs.end() && this->IsKeyword("MATCHES", *arg)) + if (argP1 != newArgs.end() && this->IsKeyword(keyMATCHES, *arg)) { *arg = cmExpandedCommandArgument("0", true); newArgs.erase(argP1); @@ -641,9 +649,9 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, } if (argP1 != newArgs.end() && argP2 != newArgs.end() && - (this->IsKeyword("LESS", *argP1) || - this->IsKeyword("GREATER", *argP1) || - this->IsKeyword("EQUAL", *argP1))) + (this->IsKeyword(keyLESS, *argP1) || + this->IsKeyword(keyGREATER, *argP1) || + this->IsKeyword(keyEQUAL, *argP1))) { def = this->GetVariableOrString(*arg); def2 = this->GetVariableOrString(*argP2); @@ -672,9 +680,9 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, } if (argP1 != newArgs.end() && argP2 != newArgs.end() && - (this->IsKeyword("STRLESS", *argP1) || - this->IsKeyword("STREQUAL", *argP1) || - this->IsKeyword("STRGREATER", *argP1))) + (this->IsKeyword(keySTRLESS, *argP1) || + this->IsKeyword(keySTREQUAL, *argP1) || + this->IsKeyword(keySTRGREATER, *argP1))) { def = this->GetVariableOrString(*arg); def2 = this->GetVariableOrString(*argP2); @@ -697,18 +705,18 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, } if (argP1 != newArgs.end() && argP2 != newArgs.end() && - (this->IsKeyword("VERSION_LESS", *argP1) || - this->IsKeyword("VERSION_GREATER", *argP1) || - this->IsKeyword("VERSION_EQUAL", *argP1))) + (this->IsKeyword(keyVERSION_LESS, *argP1) || + this->IsKeyword(keyVERSION_GREATER, *argP1) || + this->IsKeyword(keyVERSION_EQUAL, *argP1))) { def = this->GetVariableOrString(*arg); def2 = this->GetVariableOrString(*argP2); cmSystemTools::CompareOp op = cmSystemTools::OP_EQUAL; - if(*argP1 == "VERSION_LESS") + if(*argP1 == keyVERSION_LESS) { op = cmSystemTools::OP_LESS; } - else if(*argP1 == "VERSION_GREATER") + else if(*argP1 == keyVERSION_GREATER) { op = cmSystemTools::OP_GREATER; } @@ -719,7 +727,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, // is file A newer than file B if (argP1 != newArgs.end() && argP2 != newArgs.end() && - this->IsKeyword("IS_NEWER_THAN", *argP1)) + this->IsKeyword(keyIS_NEWER_THAN, *argP1)) { int fileIsNewer=0; bool success=cmSystemTools::FileTimeCompare(arg->GetValue(), @@ -731,7 +739,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, } if (argP1 != newArgs.end() && argP2 != newArgs.end() && - this->IsKeyword("IN_LIST", *argP1)) + this->IsKeyword(keyIN_LIST, *argP1)) { if(this->Policy57Status != cmPolicies::OLD && this->Policy57Status != cmPolicies::WARN) @@ -788,7 +796,7 @@ bool cmConditionEvaluator::HandleLevel3(cmArgumentList &newArgs, { argP1 = arg; IncrementArguments(newArgs,argP1,argP2); - if (argP1 != newArgs.end() && IsKeyword("NOT", *arg)) + if (argP1 != newArgs.end() && IsKeyword(keyNOT, *arg)) { bool rhs = this->GetBooleanValueWithAutoDereference(*argP1, errorString, @@ -821,7 +829,7 @@ bool cmConditionEvaluator::HandleLevel4(cmArgumentList &newArgs, { argP1 = arg; IncrementArguments(newArgs,argP1,argP2); - if (argP1 != newArgs.end() && IsKeyword("AND", *argP1) && + if (argP1 != newArgs.end() && IsKeyword(keyAND, *argP1) && argP2 != newArgs.end()) { lhs = this->GetBooleanValueWithAutoDereference(*arg, @@ -834,7 +842,7 @@ bool cmConditionEvaluator::HandleLevel4(cmArgumentList &newArgs, reducible, arg, newArgs, argP1, argP2); } - if (argP1 != newArgs.end() && this->IsKeyword("OR", *argP1) && + if (argP1 != newArgs.end() && this->IsKeyword(keyOR, *argP1) && argP2 != newArgs.end()) { lhs = this->GetBooleanValueWithAutoDereference(*arg, diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h index 8600825..3ed512d 100644 --- a/Source/cmConditionEvaluator.h +++ b/Source/cmConditionEvaluator.h @@ -33,9 +33,6 @@ public: std::string &errorString, cmake::MessageType &status); - static cmListFileContext GetConditionContext(cmMakefile* mf, - const cmCommandContext& command, std::string const& filePath); - private: // Filter the given variable definition based on policy CMP0054. const char* GetDefinitionIfUnquoted( diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index f0227b0..9e67301 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -467,6 +467,49 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile() xml.EndElement(); // projectDescription } +void cmExtraEclipseCDT4Generator::WriteGroups( + std::vector<cmSourceGroup> const& sourceGroups, + std::string& linkName, cmXMLWriter& xml) +{ + for(std::vector<cmSourceGroup>::const_iterator sgIt = sourceGroups.begin(); + sgIt != sourceGroups.end(); ++sgIt) + { + std::string linkName3 = linkName; + linkName3 += "/"; + linkName3 += sgIt->GetFullName(); + + size_t pos = 0; + while ((pos = linkName3.find("\\", pos)) != std::string::npos) + { + linkName3.replace(pos, 1, "/"); + pos++; + } + + this->AppendLinkedResource(xml, linkName3, "virtual:/virtual", + VirtualFolder); + std::vector<cmSourceGroup> const& children = sgIt->GetGroupChildren(); + if (!children.empty()) + { + this->WriteGroups(children, linkName, xml); + } + std::vector<const cmSourceFile*> sFiles = sgIt->GetSourceFiles(); + for(std::vector<const cmSourceFile*>::const_iterator + fileIt = sFiles.begin(); fileIt != sFiles.end(); ++fileIt) + { + std::string fullPath = (*fileIt)->GetFullPath(); + + if (!cmSystemTools::FileIsDirectory(fullPath)) + { + std::string linkName4 = linkName3; + linkName4 += "/"; + linkName4 += cmSystemTools::GetFilenameName(fullPath); + this->AppendLinkedResource(xml, linkName4, + this->GetEclipsePath(fullPath), + LinkToFile); + } + } + } +} //---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator::CreateLinksForTargets(cmXMLWriter& xml) @@ -523,34 +566,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(cmXMLWriter& xml) sourceGroup->AssignSource(*sfIt); } - for(std::vector<cmSourceGroup>::iterator sgIt = sourceGroups.begin(); - sgIt != sourceGroups.end(); - ++sgIt) - { - std::string linkName3 = linkName2; - linkName3 += "/"; - linkName3 += sgIt->GetFullName(); - this->AppendLinkedResource(xml, linkName3, "virtual:/virtual", - VirtualFolder); - - std::vector<const cmSourceFile*> sFiles = sgIt->GetSourceFiles(); - for(std::vector<const cmSourceFile*>::const_iterator fileIt = - sFiles.begin(); - fileIt != sFiles.end(); - ++fileIt) - { - std::string fullPath = (*fileIt)->GetFullPath(); - if (!cmSystemTools::FileIsDirectory(fullPath)) - { - std::string linkName4 = linkName3; - linkName4 += "/"; - linkName4 += cmSystemTools::GetFilenameName(fullPath); - this->AppendLinkedResource(xml, linkName4, - this->GetEclipsePath(fullPath), - LinkToFile); - } - } - } + this->WriteGroups(sourceGroups, linkName2, xml); } break; // ignore all others: diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h index 4032a6c..26955ef 100644 --- a/Source/cmExtraEclipseCDT4Generator.h +++ b/Source/cmExtraEclipseCDT4Generator.h @@ -18,6 +18,7 @@ class cmMakefile; class cmXMLWriter; +class cmSourceGroup; /** \class cmExtraEclipseCDT4Generator * \brief Write Eclipse project files for Makefile based projects @@ -100,6 +101,8 @@ private: static void AddEnvVar(std::ostream& out, const char* envVar, cmLocalGenerator* lg); + void WriteGroups(std::vector<cmSourceGroup> const& sourceGroups, + std::string& linkName, cmXMLWriter& xml); void CreateLinksToSubprojects(cmXMLWriter& xml, const std::string& baseDir); void CreateLinksForTargets(cmXMLWriter& xml); diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 1fa27eb..b0a61b2 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1015,7 +1015,7 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args, else { this->Makefile->IssueMessage(cmake::FATAL_ERROR, - "Error has occured while globbing for '" + "Error has occurred while globbing for '" + *i + "' - " + it->content); shouldExit = true; } diff --git a/Source/cmFortranLexer.cxx b/Source/cmFortranLexer.cxx index 6779c1a..7cde4cb 100644 --- a/Source/cmFortranLexer.cxx +++ b/Source/cmFortranLexer.cxx @@ -1241,7 +1241,7 @@ case 43: /* rule 43 can match eol */ YY_RULE_SETUP #line 172 "cmFortranLexer.in.l" -/* Ignore line-endings preceeded by \ */ +/* Ignore line-endings preceded by \ */ YY_BREAK case 44: YY_RULE_SETUP diff --git a/Source/cmFortranLexer.in.l b/Source/cmFortranLexer.in.l index 53984bb..e59ff5f 100644 --- a/Source/cmFortranLexer.in.l +++ b/Source/cmFortranLexer.in.l @@ -169,7 +169,7 @@ $[ \t]*endif { return F90PPR_ENDIF; } [ \t\r,] /* Ignore */ -\\[ \t]*\n /* Ignore line-endings preceeded by \ */ +\\[ \t]*\n /* Ignore line-endings preceded by \ */ . { return *yytext; } diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 5964ef1..9a07dde 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -108,8 +108,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmake::MessageType messType; cmListFileContext conditionContext = - cmConditionEvaluator::GetConditionContext( - &mf, this->Functions[c], + cmListFileContext::FromCommandContext( + this->Functions[c], this->GetStartingContext().FilePath); cmConditionEvaluator conditionEvaluator( @@ -210,8 +210,8 @@ bool cmIfCommand commandContext.Name = execContext.Name; cmConditionEvaluator conditionEvaluator( - *(this->Makefile), cmConditionEvaluator::GetConditionContext( - this->Makefile, commandContext, execContext.FilePath), + *(this->Makefile), cmListFileContext::FromCommandContext( + commandContext, execContext.FilePath), this->Makefile->GetBacktrace()); bool isTrue = conditionEvaluator.IsTrue( diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index 7ba61f3..d5d0184 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -249,7 +249,7 @@ bool cmListFile::ParseFile(const char* filename, //---------------------------------------------------------------------------- bool cmListFileParser::ParseFunction(const char* name, long line) { - // Inintialize a new function call. + // Ininitialize a new function call. this->Function = cmListFileFunction(); this->Function.Name = name; this->Function.Line = line; diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index abae564..2f66517 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -378,6 +378,11 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFortranFlagTable[] = {"FloatingPointExceptionHandling", "fpe:1", "", "fpe1", 0}, {"FloatingPointExceptionHandling", "fpe:3", "", "fpe3", 0}, + {"MultiProcessorCompilation", "MP", "", "true", + cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, + {"ProcessorNumber", "MP", "Multi-processor Compilation", "", + cmVS7FlagTable::UserValueRequired}, + {"ModulePath", "module:", "", "", cmVS7FlagTable::UserValueRequired}, {"LoopUnrolling", "Qunroll:", "", "", diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index b16eccd..ebe08b0 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -795,7 +795,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename, "\", but does not contain a " << macroName << " macro. Running moc on " << "\"" << headerToMoc << "\" ! Include \"moc_" - << basename << ".cpp\" for a compatiblity with " + << basename << ".cpp\" for a compatibility with " "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n" << std::endl; } @@ -806,7 +806,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename, "\" instead of \"moc_" << basename << ".cpp\". " "Running moc on " << "\"" << headerToMoc << "\" ! Include \"moc_" - << basename << ".cpp\" for compatiblity with " + << basename << ".cpp\" for compatibility with " "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n" << std::endl; } @@ -848,7 +848,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename, "includes " << "\"" << ownMocUnderscoreFile << "\". Running moc on " << "\"" << absFilename << "\" ! Better include \"" - << scannedFileBasename << ".moc\" for compatiblity with " + << scannedFileBasename << ".moc\" for compatibility with " "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n" << std::endl; includedMocs[absFilename] = ownMocUnderscoreFile; diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index 649fb39..3c027a0 100644 --- a/Source/cmStringCommand.cxx +++ b/Source/cmStringCommand.cxx @@ -565,7 +565,7 @@ bool cmStringCommand::HandleFindCommand(std::vector<std::string> const& // ensure that the user cannot accidentally specify REVERSE as a variable 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. " "Maybe you missed the actual output variable?"); return false; diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index f511ae4..d444675 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -116,7 +116,7 @@ public: 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() { cmSystemTools::s_FatalErrorOccured = false; diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx index 4b7afd8..aabbe27 100644 --- a/Source/cmWhileCommand.cxx +++ b/Source/cmWhileCommand.cxx @@ -56,8 +56,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf, commandContext.Name = execContext.Name; cmListFileContext conditionContext = - cmConditionEvaluator::GetConditionContext( - &mf, commandContext, + cmListFileContext::FromCommandContext( + commandContext, this->GetStartingContext().FilePath); cmConditionEvaluator conditionEvaluator( diff --git a/Source/kwsys/RegularExpression.cxx b/Source/kwsys/RegularExpression.cxx index 598e7ca..22593b4 100644 --- a/Source/kwsys/RegularExpression.cxx +++ b/Source/kwsys/RegularExpression.cxx @@ -376,7 +376,7 @@ bool RegularExpression::compile (const char* exp) { } // Allocate space. -//#ifndef WIN32 +//#ifndef _WIN32 if (this->program != 0) delete [] this->program; //#endif this->program = new char[regsize]; diff --git a/Source/kwsys/RegularExpression.hxx.in b/Source/kwsys/RegularExpression.hxx.in index d0235d8..0bb700f 100644 --- a/Source/kwsys/RegularExpression.hxx.in +++ b/Source/kwsys/RegularExpression.hxx.in @@ -333,7 +333,7 @@ inline RegularExpression::RegularExpression (const std::string& s) */ inline RegularExpression::~RegularExpression () { -//#ifndef WIN32 +//#ifndef _WIN32 delete [] this->program; //#endif } @@ -396,7 +396,7 @@ inline bool RegularExpression::is_valid () const inline void RegularExpression::set_invalid () { -//#ifndef WIN32 +//#ifndef _WIN32 delete [] this->program; //#endif this->program = 0; diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 512d5fb..81fb2f9 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -1583,7 +1583,7 @@ SystemInformationImplementation::~SystemInformationImplementation() void SystemInformationImplementation::RunCPUCheck() { -#ifdef WIN32 +#ifdef _WIN32 // Check to see if this processor supports CPUID. bool supportsCPUID = DoesCPUSupportCPUID(); @@ -2056,7 +2056,7 @@ bool SystemInformationImplementation::DoesCPUSupportFeature(long int dwFeature) void SystemInformationImplementation::Delay(unsigned int uiMS) { -#ifdef WIN32 +#ifdef _WIN32 LARGE_INTEGER Frequency, StartCounter, EndCounter; __int64 x; @@ -2339,7 +2339,7 @@ bool SystemInformationImplementation::RetrieveClassicalCPUCacheDetails() case 13: TLBCacheUnit = ((TLBCacheData[3] & 0x00FF0000) >> 16); break; case 14: TLBCacheUnit = ((TLBCacheData[3] & 0xFF000000) >> 24); break; - // Default case - an error has occured. + // Default case - an error has occurred. default: return false; } @@ -2401,7 +2401,7 @@ bool SystemInformationImplementation::RetrieveClassicalCPUCacheDetails() case 0x96: STORE_TLBCACHE_INFO (TLBCode, 262144); break; // <-- FIXME: IA-64 Only case 0x9b: STORE_TLBCACHE_INFO (TLBCode, 262144); break; // <-- FIXME: IA-64 Only - // Default case - an error has occured. + // Default case - an error has occurred. default: return false; } } diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 0c7f419..c6e668d 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -2855,6 +2855,7 @@ static bool DeleteJunction(const std::wstring& source) return false; #endif } + #endif bool SystemTools::RemoveFile(const std::string& source) @@ -2884,9 +2885,9 @@ bool SystemTools::RemoveFile(const std::string& source) SetLastError(err); return false; } - if (IsJunction(ws) && !DeleteJunction(ws)) + if (IsJunction(ws) && DeleteJunction(ws)) { - return false; + return true; } if (DeleteFileW(ws.c_str()) || GetLastError() == ERROR_FILE_NOT_FOUND || diff --git a/Source/kwsys/testEncoding.cxx b/Source/kwsys/testEncoding.cxx index 842b17d..80ec040 100644 --- a/Source/kwsys/testEncoding.cxx +++ b/Source/kwsys/testEncoding.cxx @@ -120,7 +120,7 @@ static int testRobustEncoding() ret++; } -#ifdef WIN32 +#ifdef _WIN32 // 16 bit wchar_t - we make an invalid surrogate pair wchar_t cwstr[] = {0xD801, 0xDA00, 0}; // this conversion could fail diff --git a/Tests/CMakeTests/PushCheckStateTest.cmake.in b/Tests/CMakeTests/PushCheckStateTest.cmake.in index e707b9a..b4c48f4 100644 --- a/Tests/CMakeTests/PushCheckStateTest.cmake.in +++ b/Tests/CMakeTests/PushCheckStateTest.cmake.in @@ -1,29 +1,68 @@ include(CMakePushCheckState) +set(CMAKE_EXTRA_INCLUDE_FILES file1) +set(CMAKE_REQUIRED_INCLUDES dir1) set(CMAKE_REQUIRED_DEFINITIONS defs1 ) +set(CMAKE_REQUIRED_LIBRARIES lib1) +set(CMAKE_REQUIRED_FLAGS flag1) +set(CMAKE_REQUIRED_QUIET 1) cmake_push_check_state() +set(CMAKE_EXTRA_INCLUDE_FILES file2) +set(CMAKE_REQUIRED_INCLUDES dir2) set(CMAKE_REQUIRED_DEFINITIONS defs2) +set(CMAKE_REQUIRED_LIBRARIES lib2) +set(CMAKE_REQUIRED_FLAGS flag2) +set(CMAKE_REQUIRED_QUIET 2) cmake_push_check_state() +set(CMAKE_EXTRA_INCLUDE_FILES file3) set(CMAKE_REQUIRED_DEFINITIONS defs3) +set(CMAKE_REQUIRED_INCLUDES dir3) +set(CMAKE_REQUIRED_DEFINITIONS defs3) +set(CMAKE_REQUIRED_LIBRARIES lib3) +set(CMAKE_REQUIRED_FLAGS flag3) +set(CMAKE_REQUIRED_QUIET 3) cmake_pop_check_state() -if (NOT "${CMAKE_REQUIRED_DEFINITIONS}" STREQUAL "defs2") - set(fatal TRUE) - message("ERROR: "CMAKE_REQUIRED_DEFINITIONS is \"${CMAKE_REQUIRED_DEFINITIONS}\" (expected \"defs2\")" ) -endif() +foreach(pair IN ITEMS + EXTRA_INCLUDE_FILES|file2 + REQUIRED_INCLUDES|dir2 + REQUIRED_DEFINITIONS|defs2 + REQUIRED_LIBRARIES|lib2 + REQUIRED_FLAGS|flag2 + REQUIRED_QUIET|2 + ) + string(REPLACE "|" ";" pair "${pair}") + list(GET pair 0 var) + list(GET pair 1 expected) + if (NOT "${CMAKE_${var}}" STREQUAL "${expected}") + set(fatal TRUE) + message("ERROR: CMAKE_${var} is \"${CMAKE_${var}}\" (expected \"${expected}\")" ) + endif() +endforeach() cmake_pop_check_state() -if (NOT "${CMAKE_REQUIRED_DEFINITIONS}" STREQUAL "defs1") - set(fatal TRUE) - message("ERROR: "CMAKE_REQUIRED_DEFINITIONS is \"${CMAKE_REQUIRED_DEFINITIONS}\" (expected \"defs1\")" ) -endif() - +foreach(pair IN ITEMS + EXTRA_INCLUDE_FILES|file1 + REQUIRED_INCLUDES|dir1 + REQUIRED_DEFINITIONS|defs1 + REQUIRED_LIBRARIES|lib1 + REQUIRED_FLAGS|flag1 + REQUIRED_QUIET|1 + ) + string(REPLACE "|" ";" pair "${pair}") + list(GET pair 0 var) + list(GET pair 1 expected) + if (NOT "${CMAKE_${var}}" STREQUAL "${expected}") + set(fatal TRUE) + message("ERROR: CMAKE_${var} is \"${CMAKE_${var}}\" (expected \"${expected}\")" ) + endif() +endforeach() if(fatal) message(FATAL_ERROR "cmake_push_check_state() test failed") diff --git a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake index 7065f36..8ea4452 100644 --- a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake +++ b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake @@ -99,7 +99,7 @@ was expected." endif() 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() # Check the resulting SHA diff --git a/Utilities/cmcurl/lib/curl_sasl_gssapi.c b/Utilities/cmcurl/lib/curl_sasl_gssapi.c index 3c6f3ce..5fc0e58 100644 --- a/Utilities/cmcurl/lib/curl_sasl_gssapi.c +++ b/Utilities/cmcurl/lib/curl_sasl_gssapi.c @@ -70,7 +70,7 @@ char *Curl_sasl_build_gssapi_spn(const char *service, const char *host) * userp [in] - The user name. * passdwp [in] - The user's password. * 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. * chlg64 [in] - Pointer to the optional base64 encoded challenge * message. diff --git a/Utilities/cmcurl/lib/curl_sasl_sspi.c b/Utilities/cmcurl/lib/curl_sasl_sspi.c index b149530..e96b55c 100644 --- a/Utilities/cmcurl/lib/curl_sasl_sspi.c +++ b/Utilities/cmcurl/lib/curl_sasl_sspi.c @@ -846,7 +846,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm) * userp [in] - The user name in the format User or Domain\User. * passdwp [in] - The user's password. * 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. * chlg64 [in] - The optional base64 encoded challenge message. * krb5 [in/out] - The gssapi data struct being used and modified. diff --git a/Utilities/cmcurl/lib/ftp.c b/Utilities/cmcurl/lib/ftp.c index 74c4032..29c840c 100644 --- a/Utilities/cmcurl/lib/ftp.c +++ b/Utilities/cmcurl/lib/ftp.c @@ -3671,7 +3671,7 @@ static CURLcode ftp_do_more(struct connectdata *conn, int *completep) } 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 */ result = ftp_multi_statemach(conn, &complete); diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index 00550e2..5b150b3 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -200,7 +200,7 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") # e.g. # 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 2009-01-19 11:39:10.093750000 #@@ -286,7 +286,7 @@ diff --git a/Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c b/Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c index 53bd4b8..566d264 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c @@ -1586,7 +1586,7 @@ tree_reopen(struct tree *t, const wchar_t *path, int restore_time) t->stack->flags = needsFirstVisit; /* * 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. */ { diff --git a/Utilities/cmlibarchive/libarchive/xxhash.c b/Utilities/cmlibarchive/libarchive/xxhash.c index f7647a5..e4f03ba 100644 --- a/Utilities/cmlibarchive/libarchive/xxhash.c +++ b/Utilities/cmlibarchive/libarchive/xxhash.c @@ -53,7 +53,7 @@ You can contact the author at : ** #define XXH_ACCEPT_NULL_INPUT_POINTER 1 ** 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. ** 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. |