mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-05 21:31:08 -06:00
Fix trivial typos in text
Some are user facing.
Found using
codespell -q 3 --skip="./Utilities" -I .cmake-whitelist.txt`
whereby the whitelist contained:
ans
dum
helpfull
emmited
emmitted
buil
iff
isnt
nto
ot
pathes
substract
te
todays
upto
whitespaces
This commit is contained in:
@@ -30,7 +30,7 @@ project that is useful but not necessary, such as a set of examples.
|
||||
Typically the subdirectory should contain its own :command:`project`
|
||||
command invocation so that a full build system will be generated in the
|
||||
subdirectory (such as a VS IDE solution file). Note that inter-target
|
||||
dependencies supercede this exclusion. If a target built by the
|
||||
dependencies supersede this exclusion. If a target built by the
|
||||
parent project depends on a target in the subdirectory, the dependee
|
||||
target will be included in the parent project build system to satisfy
|
||||
the dependency.
|
||||
|
||||
@@ -110,7 +110,7 @@ regular expressions, but much simpler. If ``RELATIVE`` flag is
|
||||
specified, the results will be returned as relative paths to the given
|
||||
path. The results will be ordered lexicographically.
|
||||
|
||||
By default ``GLOB`` lists directories - directories are omited in result if
|
||||
By default ``GLOB`` lists directories - directories are omitted in result if
|
||||
``LIST_DIRECTORIES`` is set to false.
|
||||
|
||||
.. note::
|
||||
|
||||
@@ -346,7 +346,7 @@ specified that does not match that given to the targets associated with
|
||||
included in the export but a target to which it links is not included
|
||||
the behavior is unspecified.
|
||||
|
||||
In additon to cmake language files, the ``EXPORT_ANDROID_MK`` option maybe
|
||||
In addition to cmake language files, the ``EXPORT_ANDROID_MK`` option maybe
|
||||
used to specifiy an export to the android ndk build system. The Android
|
||||
NDK supports the use of prebuilt libraries, both static and shared. This
|
||||
allows cmake to build the libraries of a project and make them available
|
||||
|
||||
@@ -16,7 +16,7 @@ welcome to provide testing machines in order to help keep support for their
|
||||
platforms working.
|
||||
|
||||
The `CMake Dashboard Scripts Repository`_ provides CTest scripts to drive
|
||||
nightly, continous, and experimental testing of CMake. Use the following
|
||||
nightly, continuous, and experimental testing of CMake. Use the following
|
||||
commands to set up a new integration testing client:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
@@ -66,7 +66,7 @@ Variables
|
||||
Properties
|
||||
----------
|
||||
|
||||
* :ref:`Visual Studio Generators` learned to support additonal
|
||||
* :ref:`Visual Studio Generators` learned to support additional
|
||||
target properties to customize projects for NVIDIA Nsight
|
||||
Tegra Visual Studio Edition:
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ Modules
|
||||
|
||||
* The :module:`ExternalProject` module learned to initialize Git submodules
|
||||
recursively and also to initialize new submodules on updates. Use the
|
||||
``GIT_SUBMODULES`` option to restrict which submodules are initalized and
|
||||
``GIT_SUBMODULES`` option to restrict which submodules are initialized and
|
||||
updated.
|
||||
|
||||
* The :module:`ExternalProject` module leared the ``DOWNLOAD_NO_EXTRACT 1``
|
||||
|
||||
@@ -237,7 +237,7 @@ CPack
|
||||
|
||||
* The :module:`CPackIFW` module :command:`cpack_ifw_configure_component` and
|
||||
:command:`cpack_ifw_configure_component_group` commands gained a new
|
||||
``USER_INTERFACES`` option to add a list of additonal pages to the IFW
|
||||
``USER_INTERFACES`` option to add a list of additional pages to the IFW
|
||||
installer.
|
||||
|
||||
* The :module:`CPackRPM` module learned to generate debuginfo
|
||||
|
||||
@@ -5,5 +5,5 @@ Old library location variable.
|
||||
|
||||
The target properties :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
|
||||
:prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY`
|
||||
supercede this variable for a target if they are set. Library targets are
|
||||
supersede this variable for a target if they are set. Library targets are
|
||||
otherwise placed in this directory.
|
||||
|
||||
@@ -31,7 +31,7 @@ function(android_push_test_files_to_device)
|
||||
set(out_var ${out_var} PARENT_SCOPE)
|
||||
if(res_var)
|
||||
string(REGEX REPLACE ";" " " com "${ARGN}")
|
||||
message(FATAL_ERROR "Error occured during adb command: adb ${com}\nError: ${err_var}.")
|
||||
message(FATAL_ERROR "Error occurred during adb command: adb ${com}\nError: ${err_var}.")
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
|
||||
@@ -154,7 +154,7 @@
|
||||
# macro.
|
||||
#
|
||||
# Internally, this macro executes :command:`configure_file()` to create the
|
||||
# resulting version file. Depending on the ``COMPATIBLITY``, either the file
|
||||
# resulting version file. Depending on the ``COMPATIBILITY``, either the file
|
||||
# ``BasicConfigVersion-SameMajorVersion.cmake.in`` or
|
||||
# ``BasicConfigVersion-AnyNewerVersion.cmake.in`` is used. Please note that
|
||||
# these two files are internal to CMake and you should not call
|
||||
|
||||
@@ -817,7 +817,7 @@ if(CPACK_IFW_INSTALLERBASE_EXECUTABLE AND NOT CPACK_IFW_FRAMEWORK_VERSION_FORCED
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
# Finaly try to get version from executable path
|
||||
# Finally try to get version from executable path
|
||||
if(NOT CPACK_IFW_FRAMEWORK_VERSION)
|
||||
string(REGEX MATCH "[0-9]+(\\.[0-9]+)*"
|
||||
CPACK_IFW_FRAMEWORK_VERSION "${CPACK_IFW_INSTALLERBASE_EXECUTABLE}")
|
||||
@@ -864,7 +864,7 @@ macro(_cpack_ifw_resolve_script _variable)
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
# Resolve full path to lisense file
|
||||
# Resolve full path to license file
|
||||
macro(_cpack_ifw_resolve_lisenses _variable)
|
||||
if(${_variable})
|
||||
set(_ifw_license_file FALSE)
|
||||
|
||||
@@ -545,7 +545,7 @@
|
||||
# /usr/share/doc
|
||||
#
|
||||
# May be used to exclude path (directories or files) from the auto-generated
|
||||
# list of paths discovered by CPack RPM. The defaut value contains a
|
||||
# list of paths discovered by CPack RPM. The default value contains a
|
||||
# reasonable set of values if the variable is not defined by the user. If the
|
||||
# variable is defined by the user then CPackRPM will NOT any of the default
|
||||
# path. If you want to add some path to the default list then you can use
|
||||
@@ -782,7 +782,7 @@
|
||||
#
|
||||
# .. note::
|
||||
#
|
||||
# Each source path prefix is additionaly suffixed by ``src_<index>`` where
|
||||
# Each source path prefix is additionally suffixed by ``src_<index>`` where
|
||||
# index is index of the path used from :variable:`CPACK_BUILD_SOURCE_DIRS`
|
||||
# variable. This produces ``<CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX>/src_<index>``
|
||||
# replacement path.
|
||||
@@ -1985,13 +1985,13 @@ function(cpack_rpm_generate_package)
|
||||
# CPACK_RPM_POST_INSTALL_SCRIPT_FILE (or CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE)
|
||||
# CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE (or CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE)
|
||||
# May be used to embed a post (un)installation script in the spec file.
|
||||
# The refered script file(s) will be read and directly
|
||||
# The referred script file(s) will be read and directly
|
||||
# put after the %post or %postun section
|
||||
# ----------------------------------------------------------------
|
||||
# CPACK_RPM_PRE_INSTALL_SCRIPT_FILE (or CPACK_RPM_<COMPONENT>_PRE_INSTALL_SCRIPT_FILE)
|
||||
# CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE (or CPACK_RPM_<COMPONENT>_PRE_UNINSTALL_SCRIPT_FILE)
|
||||
# May be used to embed a pre (un)installation script in the spec file.
|
||||
# The refered script file(s) will be read and directly
|
||||
# The referred script file(s) will be read and directly
|
||||
# put after the %pre or %preun section
|
||||
foreach(RPM_SCRIPT_FILE_TYPE_ "INSTALL" "UNINSTALL")
|
||||
foreach(RPM_SCRIPT_FILE_TIME_ "PRE" "POST")
|
||||
@@ -2022,7 +2022,7 @@ function(cpack_rpm_generate_package)
|
||||
|
||||
# CPACK_RPM_CHANGELOG_FILE
|
||||
# May be used to embed a changelog in the spec file.
|
||||
# The refered file will be read and directly put after the %changelog section
|
||||
# The referred file will be read and directly put after the %changelog section
|
||||
if(CPACK_RPM_CHANGELOG_FILE)
|
||||
if(EXISTS ${CPACK_RPM_CHANGELOG_FILE})
|
||||
file(READ ${CPACK_RPM_CHANGELOG_FILE} CPACK_RPM_SPEC_CHANGELOG)
|
||||
@@ -2152,7 +2152,7 @@ function(cpack_rpm_generate_package)
|
||||
string(STRIP "${CPACK_RPM_INSTALL_FILES}" CPACK_RPM_INSTALL_FILES_LIST)
|
||||
# Transform endline separated - string into CMake List
|
||||
string(REPLACE "\n" ";" CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES_LIST}")
|
||||
# Remove unecessary quotes
|
||||
# Remove unnecessary quotes
|
||||
string(REPLACE "\"" "" CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES_LIST}")
|
||||
# Remove ABSOLUTE install file from INSTALL FILE LIST
|
||||
list(REMOVE_ITEM CPACK_RPM_INSTALL_FILES_LIST ${CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL})
|
||||
@@ -2413,7 +2413,7 @@ ${TMP_DEBUGINFO_ADDITIONAL_SOURCES}
|
||||
endif()
|
||||
|
||||
# Disable debuginfo packages - srpm generates invalid packages due to
|
||||
# releasing controll to cpack to generate binary packages.
|
||||
# releasing control to cpack to generate binary packages.
|
||||
# Note however that this doesn't prevent cpack to generate debuginfo
|
||||
# packages when run from srpm with --rebuild.
|
||||
set(TMP_RPM_DISABLE_DEBUGINFO "%define debug_package %{nil}")
|
||||
|
||||
@@ -65,7 +65,7 @@ endfunction()
|
||||
include(CTestUseLaunchers)
|
||||
|
||||
if(BUILD_TESTING)
|
||||
# Setup some auxilary macros
|
||||
# Setup some auxiliary macros
|
||||
macro(SET_IF_NOT_SET var val)
|
||||
if(NOT DEFINED "${var}")
|
||||
set("${var}" "${val}")
|
||||
|
||||
@@ -17,7 +17,7 @@ if("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM")
|
||||
find_program(CMAKE_IAR_ARCHIVE iarchive.exe HINTS ${__iar_hints}
|
||||
DOC "The IAR archiver")
|
||||
|
||||
# find auxillary tools
|
||||
# find auxiliary tools
|
||||
find_program(CMAKE_IAR_ELFTOOL ielftool.exe HINTS ${__iar_hints}
|
||||
DOC "The IAR ELF Tool")
|
||||
find_program(CMAKE_IAR_ELFDUMP ielfdumparm.exe HINTS ${__iar_hints}
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
# "Silent" Operation
|
||||
#
|
||||
# this really is different to most programs I know.
|
||||
# nothing meaningfull from the operation is lost, just some redundant
|
||||
# nothing meaningful from the operation is lost, just some redundant
|
||||
# code and data size printouts (that can be inspected with common tools).
|
||||
|
||||
# This module is shared by multiple languages; use include blocker.
|
||||
|
||||
@@ -40,7 +40,7 @@ if (BUILD_DOCUMENTATION)
|
||||
)
|
||||
|
||||
#
|
||||
# The documentation process is controled by a batch file.
|
||||
# The documentation process is controlled by a batch file.
|
||||
# We will probably need bash to create the custom target
|
||||
#
|
||||
|
||||
|
||||
@@ -493,7 +493,7 @@ endfunction()
|
||||
by the project when available at buildtime, but it also work without.
|
||||
``RECOMMENDED`` is similar to ``OPTIONAL``, i.e. the project will build if
|
||||
the package is not present, but the functionality of the resulting
|
||||
binaries will be severly limited. If a ``REQUIRED`` package is not
|
||||
binaries will be severely limited. If a ``REQUIRED`` package is not
|
||||
available at buildtime, the project may not even build. This can be
|
||||
combined with the ``FATAL_ON_MISSING_REQUIRED_PACKAGES`` argument for
|
||||
``feature_summary()``. Last, a ``RUNTIME`` package is a package which is
|
||||
|
||||
@@ -581,7 +581,7 @@ mark_as_advanced(
|
||||
# Makefile and similar generators don't define CMAKE_CONFIGURATION_TYPES, so we
|
||||
# need to add another entry for the CMAKE_BUILD_TYPE. We also need to add the
|
||||
# standerd set of 4 build types (Debug, MinSizeRel, Release, and RelWithDebInfo)
|
||||
# for completeness. We need run this loop in order to accomodate the addition
|
||||
# for completeness. We need run this loop in order to accommodate the addition
|
||||
# of extra configuration types. Duplicate entries will be removed by
|
||||
# REMOVE_DUPLICATES.
|
||||
set(CUDA_configuration_types ${CMAKE_CONFIGURATION_TYPES} ${CMAKE_BUILD_TYPE} Debug MinSizeRel Release RelWithDebInfo)
|
||||
|
||||
@@ -181,7 +181,7 @@ cuda_execute_process(
|
||||
set(depends_CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS}")
|
||||
set(CUDA_VERSION @CUDA_VERSION@)
|
||||
if(CUDA_VERSION VERSION_LESS "3.0")
|
||||
# Note that this will remove all occurances of -G.
|
||||
# Note that this will remove all occurrences of -G.
|
||||
list(REMOVE_ITEM depends_CUDA_NVCC_FLAGS "-G")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
#
|
||||
# Version 1.3 (8/19/10) (CMake 2.8.3)
|
||||
# Included patch by Simone Rossetto to check if either Python or Perl
|
||||
# are present in the system. Whichever intepreter that is detected
|
||||
# are present in the system. Whichever interpreter that is detected
|
||||
# is now used to run the test generator program. If both interpreters
|
||||
# are detected, the CXXTEST_USE_PYTHON variable is obeyed.
|
||||
#
|
||||
|
||||
@@ -217,7 +217,7 @@ if(EXISTS ${DCMTK_DIR}/CMakeCache.txt)
|
||||
if(NOT EXISTS ${EXTDCMTK_SOURCE_DIR})
|
||||
message(FATAL_ERROR
|
||||
"DCMTK build directory references
|
||||
nonexistant DCMTK source directory ${EXTDCMTK_SOURCE_DIR}")
|
||||
nonexistent DCMTK source directory ${EXTDCMTK_SOURCE_DIR}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -70,5 +70,5 @@ find_library(ILU_LIBRARIES
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(DevIL DEFAULT_MSG
|
||||
IL_LIBRARIES ILU_LIBRARIES
|
||||
IL_INCLUDE_DIR)
|
||||
# provide legacy variable for compatiblity
|
||||
# provide legacy variable for compatibility
|
||||
set(IL_FOUND ${DevIL_FOUND})
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
#
|
||||
#
|
||||
#
|
||||
# Flex scanners oftenly use tokens defined by Bison: the code generated
|
||||
# Flex scanners often use tokens defined by Bison: the code generated
|
||||
# by Flex depends of the header generated by Bison. This module also
|
||||
# defines a macro:
|
||||
#
|
||||
|
||||
@@ -479,7 +479,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE)
|
||||
#if we detect that occurrence clear the suffix
|
||||
if(_suffix AND NOT TARGET ${HDF5_${_lang}_TARGET}${_suffix})
|
||||
if(NOT TARGET ${HDF5_${_lang}_TARGET})
|
||||
#cant find this component with or without the suffix
|
||||
#can't find this component with or without the suffix
|
||||
#so bail out, and let the following locate HDF5
|
||||
set(HDF5_FOUND FALSE)
|
||||
break()
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
# JAVA_INCLUDE_PATH2 = the include path to jni_md.h
|
||||
# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
|
||||
|
||||
# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
|
||||
# Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set ${_var}
|
||||
macro(java_append_library_directories _var)
|
||||
# Determine java arch-specific library subdir
|
||||
# Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
|
||||
@@ -46,7 +46,7 @@ macro(java_append_library_directories _var)
|
||||
set(_java_libarch "arm" "aarch32")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
|
||||
# mips* machines are bi-endian mostly so processor does not tell
|
||||
# endianess of the underlying system.
|
||||
# endianness of the underlying system.
|
||||
set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
|
||||
set(_java_libarch "ppc64" "ppc64le")
|
||||
|
||||
@@ -1198,7 +1198,7 @@ if(_numbers_of_matlab_roots EQUAL 0)
|
||||
|
||||
|
||||
# At this point, we have no other choice than trying to find it from PATH.
|
||||
# If set by the user, this wont change
|
||||
# If set by the user, this won't change
|
||||
find_program(
|
||||
_matlab_main_tmp
|
||||
NAMES matlab)
|
||||
|
||||
@@ -110,7 +110,7 @@ if(WIN32 AND NOT CYGWIN)
|
||||
# * MTd for static-debug
|
||||
|
||||
# Implementation details:
|
||||
# We are using the libraries located in the VC subdir instead of the parent directory eventhough :
|
||||
# We are using the libraries located in the VC subdir instead of the parent directory even though :
|
||||
# libeay32MD.lib is identical to ../libeay32.lib, and
|
||||
# ssleay32MD.lib is identical to ../ssleay32.lib
|
||||
# enable OPENSSL_USE_STATIC_LIBS to use the static libs located in lib/VC/static
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#
|
||||
#
|
||||
# In an effort to remove some clutter and clear up some issues for
|
||||
# people who are not necessarily Tcl/Tk gurus/developpers, some
|
||||
# people who are not necessarily Tcl/Tk gurus/developers, some
|
||||
# variables were moved or removed. Changes compared to CMake 2.4 are:
|
||||
#
|
||||
# ::
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#
|
||||
#
|
||||
# In an effort to remove some clutter and clear up some issues for
|
||||
# people who are not necessarily Tcl/Tk gurus/developpers, some
|
||||
# people who are not necessarily Tcl/Tk gurus/developers, some
|
||||
# variables were moved or removed. Changes compared to CMake 2.4 are:
|
||||
#
|
||||
# ::
|
||||
|
||||
@@ -915,7 +915,7 @@ if (_wx_lib_missing)
|
||||
endif()
|
||||
unset(_wx_lib_missing)
|
||||
|
||||
# Check if a specfic version was requested by find_package().
|
||||
# Check if a specific version was requested by find_package().
|
||||
if(wxWidgets_FOUND)
|
||||
find_file(_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH)
|
||||
dbg_msg("_filename: ${_filename}")
|
||||
|
||||
@@ -390,7 +390,7 @@ if(WIN32_STYLE_FIND)
|
||||
|
||||
if (NOT WXWINDOWS_USE_SHARED_LIBS)
|
||||
set(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
|
||||
## these ones dont seem required, in particular ctl3d32 is not neccesary (Jan Woetzel 07/2003)
|
||||
## these ones don't seem required, in particular ctl3d32 is not necessary (Jan Woetzel 07/2003)
|
||||
# ctl3d32
|
||||
debug ${WXWINDOWS_STATIC_DEBUG_LIBRARY_ZLIB} optimized ${WXWINDOWS_STATIC_LIBRARY_ZLIB}
|
||||
debug ${WXWINDOWS_STATIC_DEBUG_LIBRARY_REGEX} optimized ${WXWINDOWS_STATIC_LIBRARY_REGEX}
|
||||
@@ -546,7 +546,7 @@ if(WIN32_STYLE_FIND)
|
||||
endif()
|
||||
|
||||
|
||||
## not neccessary in wxWindows 2.4.1 and 2.6.2
|
||||
## not necessary in wxWindows 2.4.1 and 2.6.2
|
||||
## but it may fix a previous bug, see
|
||||
## http://lists.wxwindows.org/cgi-bin/ezmlm-cgi?8:mss:37574:200305:mpdioeneabobmgjenoap
|
||||
option(WXWINDOWS_SET_DEFINITIONS "Set additional defines for wxWindows" OFF)
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
|
||||
|
||||
# work around an old bug in ITK prior to verison 3.0
|
||||
# work around an old bug in ITK prior to version 3.0
|
||||
set(TIFF_RIGHT_VERSION 1)
|
||||
|
||||
|
||||
@@ -151,7 +151,7 @@ macro (QT4_GENERATE_MOC infile outfile )
|
||||
set(moc_target ${ARGV3})
|
||||
endif()
|
||||
QT4_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" "" "${moc_target}")
|
||||
set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file
|
||||
set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # don't run automoc on this file
|
||||
endmacro ()
|
||||
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ message(STATUS "squish_settingsgroup='${squish_settingsgroup}'")
|
||||
message(STATUS "squish_pre_command='${squish_pre_command}'")
|
||||
message(STATUS "squish_post_command='${squish_post_command}'")
|
||||
|
||||
# parse enviornment variables
|
||||
# parse environment variables
|
||||
foreach(i ${squish_env_vars})
|
||||
message(STATUS "parsing env var key/value pair ${i}")
|
||||
string(REGEX MATCH "([^=]*)=(.*)" squish_env_name ${i})
|
||||
|
||||
@@ -181,7 +181,7 @@ macro(ECOS_ADD_EXECUTABLE _exe_NAME )
|
||||
#the executable depends on ecos target.ld
|
||||
ECOS_ADD_TARGET_LIB(${ARGN})
|
||||
|
||||
# when using nmake makefiles, the custom buildtype supresses the default cl.exe flags
|
||||
# when using nmake makefiles, the custom buildtype suppresses the default cl.exe flags
|
||||
# and the rules for creating objects are adjusted for gcc
|
||||
set(CMAKE_BUILD_TYPE CUSTOM_ECOS_BUILD)
|
||||
set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
|
||||
|
||||
@@ -286,7 +286,7 @@
|
||||
#
|
||||
# Example:
|
||||
# create_javadoc(my_example_doc
|
||||
# PACKAGES com.exmaple.foo com.example.bar
|
||||
# PACKAGES com.example.foo com.example.bar
|
||||
# SOURCEPATH "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
# CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
|
||||
# WINDOWTITLE "My example"
|
||||
|
||||
@@ -90,7 +90,7 @@ void cmWIXPatchParser::StartFragment(const char** attributes)
|
||||
}
|
||||
}
|
||||
|
||||
/* add any additional attributes for the fragement */
|
||||
/* add any additional attributes for the fragment */
|
||||
if (!new_element) {
|
||||
ReportValidationError("No 'Id' specified for 'CPackWixFragment' element");
|
||||
} else {
|
||||
|
||||
@@ -31,7 +31,7 @@ cmCPackGenericGenerator::ProcessGenerator // DoPackage
|
||||
|
||||
|
||||
cmCPackGenericGenerator::InstallProject is used for both source and binary
|
||||
packages. It is controled based on values set in CPACK_ variables.
|
||||
packages. It is controlled based on values set in CPACK_ variables.
|
||||
|
||||
|
||||
InstallProject
|
||||
|
||||
@@ -81,7 +81,7 @@ cmCTestScriptHandler::cmCTestScriptHandler()
|
||||
|
||||
this->ScriptStartTime = 0;
|
||||
|
||||
// the *60 is becuase the settings are in minutes but GetTime is seconds
|
||||
// the *60 is because the settings are in minutes but GetTime is seconds
|
||||
this->MinimumInterval = 30 * 60;
|
||||
this->ContinuousDuration = -1;
|
||||
}
|
||||
@@ -830,7 +830,7 @@ int cmCTestScriptHandler::RunConfigurationDashboard()
|
||||
}
|
||||
}
|
||||
|
||||
// if all was succesful, delete the backup dirs to free up disk space
|
||||
// if all was successful, delete the backup dirs to free up disk space
|
||||
if (this->Backup) {
|
||||
cmSystemTools::RemoveADirectory(this->BackupSourceDir);
|
||||
cmSystemTools::RemoveADirectory(this->BackupBinaryDir);
|
||||
|
||||
@@ -1521,7 +1521,7 @@ int cmCTestSubmitHandler::ProcessHandler()
|
||||
this->CTest->GetCTestConfiguration("DropLocation");
|
||||
|
||||
// change to the build directory so that we can uses a relative path
|
||||
// on windows since scp dosn't support "c:" a drive in the path
|
||||
// on windows since scp doesn't support "c:" a drive in the path
|
||||
cmWorkingDirectory workdir(buildDirectory);
|
||||
|
||||
if (!this->SubmitUsingSCP(this->CTest->GetCTestConfiguration("ScpCommand"),
|
||||
@@ -1540,7 +1540,7 @@ int cmCTestSubmitHandler::ProcessHandler()
|
||||
std::string location = this->CTest->GetCTestConfiguration("DropLocation");
|
||||
|
||||
// change to the build directory so that we can uses a relative path
|
||||
// on windows since scp dosn't support "c:" a drive in the path
|
||||
// on windows since scp doesn't support "c:" a drive in the path
|
||||
cmWorkingDirectory workdir(buildDirectory);
|
||||
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
|
||||
" Change directory: " << buildDirectory << std::endl,
|
||||
|
||||
@@ -39,7 +39,7 @@ public:
|
||||
int ProcessHandler() override;
|
||||
|
||||
/**
|
||||
* When both -R and -I are used should te resulting test list be the
|
||||
* When both -R and -I are used should the resulting test list be the
|
||||
* intersection or the union of the lists. By default it is the
|
||||
* intersection.
|
||||
*/
|
||||
|
||||
@@ -93,7 +93,7 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file)
|
||||
// This section accounts for lines that were previously marked
|
||||
// as non-executable code (-1), if the parser comes back with
|
||||
// a non-zero count, increase the count by 1 to push the line
|
||||
// into the executable code set in addtion to the count found.
|
||||
// into the executable code set in addition to the count found.
|
||||
if (coverageVector[lineoffset + linenumber] == -1 && count > 0) {
|
||||
coverageVector[lineoffset + linenumber] += count + 1;
|
||||
} else {
|
||||
|
||||
@@ -20,7 +20,7 @@ class SystemInformation;
|
||||
* \brief Query host system specific information
|
||||
*
|
||||
* cmCMakeHostSystemInformationCommand queries system information of
|
||||
* the sytem on which CMake runs.
|
||||
* the system on which CMake runs.
|
||||
*/
|
||||
class cmCMakeHostSystemInformationCommand : public cmCommand
|
||||
{
|
||||
|
||||
@@ -107,7 +107,7 @@ public:
|
||||
std::set<std::string>& excludes,
|
||||
std::set<std::string>& includes);
|
||||
|
||||
///! Save cache for given makefile. Saves to ouput path/CMakeCache.txt
|
||||
///! Save cache for given makefile. Saves to output path/CMakeCache.txt
|
||||
bool SaveCache(const std::string& path);
|
||||
|
||||
///! Delete the cache given
|
||||
|
||||
@@ -343,7 +343,7 @@ def __with_argument(node, value):
|
||||
|
||||
|
||||
def __preprocess_arguments(root):
|
||||
"""Preprocesses occurrances of Argument within the root.
|
||||
"""Preprocesses occurrences of Argument within the root.
|
||||
|
||||
Argument XML values reference other values within the document by name. The
|
||||
referenced value does not contain a switch. This function will add the
|
||||
|
||||
@@ -591,7 +591,7 @@ void cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
|
||||
std::string::size_type commaPos = input.find(',', nameStartPos);
|
||||
std::string::size_type nextOpenPos = input.find("$<", nameStartPos);
|
||||
if (commaPos == std::string::npos // Implied 'this' target
|
||||
|| closePos == std::string::npos // Imcomplete expression.
|
||||
|| closePos == std::string::npos // Incomplete expression.
|
||||
|| closePos < commaPos // Implied 'this' target
|
||||
|| nextOpenPos < commaPos) // Non-literal
|
||||
{
|
||||
|
||||
@@ -329,7 +329,7 @@ void cmFindCommon::ComputeFinalPaths()
|
||||
std::set<std::string> ignored;
|
||||
this->GetIgnoredPaths(ignored);
|
||||
|
||||
// Combine the seperate path types, filtering out ignores
|
||||
// Combine the separate path types, filtering out ignores
|
||||
this->SearchPaths.clear();
|
||||
std::vector<PathLabel>& allLabels = this->PathGroupLabelMap[PathGroup::All];
|
||||
for (PathLabel const& l : allLabels) {
|
||||
|
||||
@@ -590,7 +590,7 @@ void cmFindPackageCommand::SetModuleVariables(const std::string& components)
|
||||
this->AddFindDefinition(exact, this->VersionExact ? "1" : "0");
|
||||
}
|
||||
|
||||
// Push on to the pacakge stack
|
||||
// Push on to the package stack
|
||||
this->Makefile->FindPackageModuleStack.push_back(this->Name);
|
||||
}
|
||||
|
||||
|
||||
@@ -962,7 +962,7 @@ std::string cmGlobalGenerator::GetLanguageOutputExtension(
|
||||
}
|
||||
} else {
|
||||
// if no language is found then check to see if it is already an
|
||||
// ouput extension for some language. In that case it should be ignored
|
||||
// output extension for some language. In that case it should be ignored
|
||||
// and in this map, so it will not be compiled but will just be used.
|
||||
std::string const& ext = source.GetExtension();
|
||||
if (!ext.empty()) {
|
||||
|
||||
@@ -110,7 +110,7 @@ bool cmGlobalKdevelopGenerator::CreateFilelistFile(
|
||||
nullptr)) {
|
||||
files.insert(tmp);
|
||||
tmp = cmSystemTools::GetFilenameName(tmp);
|
||||
// add all files which dont match the default
|
||||
// add all files which don't match the default
|
||||
// */CMakeLists.txt;*cmake; to the file pattern
|
||||
if ((tmp != "CMakeLists.txt") &&
|
||||
(strstr(tmp.c_str(), ".cmake") == nullptr)) {
|
||||
|
||||
@@ -222,7 +222,7 @@ void cmGlobalVisualStudio71Generator::WriteProjectConfigurations(
|
||||
}
|
||||
}
|
||||
|
||||
// ouput standard header for dsw file
|
||||
// output standard header for dsw file
|
||||
void cmGlobalVisualStudio71Generator::WriteSLNHeader(std::ostream& fout)
|
||||
{
|
||||
fout << "Microsoft Visual Studio Solution File, Format Version 8.00\n";
|
||||
|
||||
@@ -146,7 +146,7 @@ bool cmGlobalVisualStudio8Generator::SetGeneratorPlatform(std::string const& p,
|
||||
}
|
||||
}
|
||||
|
||||
// ouput standard header for dsw file
|
||||
// output standard header for dsw file
|
||||
void cmGlobalVisualStudio8Generator::WriteSLNHeader(std::ostream& fout)
|
||||
{
|
||||
fout << "Microsoft Visual Studio Solution File, Format Version 9.00\n";
|
||||
|
||||
@@ -77,7 +77,7 @@ static bool StartsWithGeneratorExpression(const std::string& input)
|
||||
// do a lot of cleanup on the arguments because this is one place where folks
|
||||
// sometimes take the output of a program and pass it directly into this
|
||||
// command not thinking that a single argument could be filled with spaces
|
||||
// and newlines etc liek below:
|
||||
// and newlines etc like below:
|
||||
//
|
||||
// " /foo/bar
|
||||
// /boo/hoo /dingle/berry "
|
||||
|
||||
@@ -599,7 +599,7 @@ void cmMakefile::EnforceDirectoryLevelRules() const
|
||||
<< "\"cmake --help-policy CMP0000\".";
|
||||
switch (this->GetPolicyStatus(cmPolicies::CMP0000)) {
|
||||
case cmPolicies::WARN:
|
||||
// Warn because the user did not provide a mimimum required
|
||||
// Warn because the user did not provide a minimum required
|
||||
// version.
|
||||
this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
|
||||
msg.str(), this->Backtrace);
|
||||
|
||||
@@ -561,7 +561,7 @@ public:
|
||||
bool atOnly, bool escapeQuotes) const;
|
||||
|
||||
/**
|
||||
* Copy file but change lines acording to ConfigureString
|
||||
* Copy file but change lines according to ConfigureString
|
||||
*/
|
||||
int ConfigureFile(const char* infile, const char* outfile, bool copyonly,
|
||||
bool atOnly, bool escapeQuotes,
|
||||
@@ -800,7 +800,7 @@ public:
|
||||
void RemoveExportBuildFileGeneratorCMP0024(cmExportBuildFileGenerator* gen);
|
||||
void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
|
||||
|
||||
// Maintain a stack of pacakge names to determine the depth of find modules
|
||||
// Maintain a stack of package names to determine the depth of find modules
|
||||
// we are currently being called with
|
||||
std::deque<std::string> FindPackageModuleStack;
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args,
|
||||
std::string message = cmJoin(cmMakeRange(i, args.end()), std::string());
|
||||
|
||||
if (type != cmake::MESSAGE) {
|
||||
// we've overriden the message type, above, so display it directly
|
||||
// we've overridden the message type, above, so display it directly
|
||||
cmMessenger* m = this->Makefile->GetMessenger();
|
||||
m->DisplayMessage(type, message, this->Makefile->GetBacktrace());
|
||||
} else {
|
||||
|
||||
@@ -827,7 +827,7 @@ bool cmQtAutoGenerators::ParseHeaderFile(std::string const& absFilename,
|
||||
bool cmQtAutoGenerators::ParsePostprocess()
|
||||
{
|
||||
bool success = true;
|
||||
// Read missin dependecies
|
||||
// Read missing dependencies
|
||||
for (auto& item : this->MocJobsIncluded) {
|
||||
if (!item->DependsValid) {
|
||||
std::string content;
|
||||
@@ -1427,7 +1427,7 @@ bool cmQtAutoGenerators::MocGenerateAll()
|
||||
}
|
||||
}
|
||||
|
||||
// Add moc_predefs.h to moc file dependecies
|
||||
// Add moc_predefs.h to moc file dependencies
|
||||
for (auto const& item : this->MocJobsIncluded) {
|
||||
item->Depends.insert(this->MocPredefsFileAbs);
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ class cmTargetDepend
|
||||
cmGeneratorTarget const* Target;
|
||||
|
||||
// The set order depends only on the Target, so we use
|
||||
// mutable members to acheive a map with set syntax.
|
||||
// mutable members to achieve a map with set syntax.
|
||||
mutable bool Link;
|
||||
mutable bool Util;
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@ std::string cmTimestamp::AddTimestampComponent(char flag,
|
||||
if (unixEpoch == -1) {
|
||||
cmSystemTools::Error(
|
||||
"Error generating UNIX epoch in "
|
||||
"STRING(TIMESTAMP ...). Please, file a bug report aginst CMake");
|
||||
"STRING(TIMESTAMP ...). Please, file a bug report against CMake");
|
||||
return std::string();
|
||||
}
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@ bool cmUseMangledMesaCommand::InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus&)
|
||||
{
|
||||
// expected two arguments:
|
||||
// arguement one: the full path to gl_mangle.h
|
||||
// arguement two : directory for output of edited headers
|
||||
// argument one: the full path to gl_mangle.h
|
||||
// argument two : directory for output of edited headers
|
||||
if (args.size() != 2) {
|
||||
this->SetError("called with incorrect number of arguments");
|
||||
return false;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
Based on the default np_macmain.cpp from FireBreath
|
||||
http://firebreath.googlecode.com
|
||||
|
||||
This file has been stripped to prevent it from accidently
|
||||
This file has been stripped to prevent it from accidentally
|
||||
doing anything useful.
|
||||
\***********************************************************/
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ macro(GET_DATE)
|
||||
|
||||
#
|
||||
# Extract six individual components by matching a regex with paren groupings.
|
||||
# Use the replace functionality and \\1 thru \\6 to extract components.
|
||||
# Use the replace functionality and \\1 through \\6 to extract components.
|
||||
#
|
||||
set(${GD_PREFIX}REGEX "([^/]+)/([^/]+)/([^ ]+) +([^:]+):([^:]+):([^\\.]+)")
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
MODULE Available
|
||||
! no conent
|
||||
! no content
|
||||
END MODULE
|
||||
|
||||
PROGRAM PPTEST
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifdef FOO
|
||||
MODULE PPAvailable
|
||||
! no conent
|
||||
! no content
|
||||
END MODULE
|
||||
#endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# a simple test cas
|
||||
# a simple test case
|
||||
cmake_minimum_required (VERSION 2.6)
|
||||
project (OutOfSource)
|
||||
|
||||
|
||||
@@ -149,7 +149,7 @@ this step and must contain
|
||||
NOTE: This variable should be used only as last resort as it sets generator
|
||||
specific regular expression.
|
||||
EXPECTED_FILE_CONTENT_<file_number_starting_with_1>_LIST should be
|
||||
prefered as it requires a list of expected files and directories that
|
||||
preferred as it requires a list of expected files and directories that
|
||||
is later changed automatically depending on the generator so expected
|
||||
package content can be written only once per test for all generators.
|
||||
|
||||
@@ -209,7 +209,7 @@ To add a new generator we must
|
||||
+ FILE that will contain the package file for which the package content
|
||||
should be returned.
|
||||
+ RESULT_VAR that will tell the function which variable in parent scope
|
||||
should contain the result (list of pacakge content)
|
||||
should contain the result (list of package content)
|
||||
- toExpectedContentList: This function should convert an expected package
|
||||
content list into one that is expected for the
|
||||
generator (e.g. rpm packages have install/relocate
|
||||
|
||||
@@ -7,6 +7,6 @@ run_cmake(nomessage-internal-warning)
|
||||
run_cmake(warnmessage)
|
||||
# message command sets fatal occurred flag, so check each type of error
|
||||
|
||||
# seperately
|
||||
# separately
|
||||
run_cmake(errormessage_deprecated)
|
||||
run_cmake(errormessage_dev)
|
||||
|
||||
@@ -19,7 +19,7 @@ function(LIST_SPACES_APPEND_ONCE LIST_NAME)
|
||||
set(${LIST_NAME} "${NEW_LIST_SPACE}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
# Convinience function that does the same as LIST(FIND ...) but with a TRUE/FALSE return value.
|
||||
# Convenience function that does the same as LIST(FIND ...) but with a TRUE/FALSE return value.
|
||||
# Ex: IN_STR_LIST(MY_LIST "Searched item" WAS_FOUND)
|
||||
function(IN_STR_LIST LIST_NAME ITEM_SEARCHED RETVAL)
|
||||
list(FIND ${LIST_NAME} ${ITEM_SEARCHED} FIND_POS)
|
||||
|
||||
Reference in New Issue
Block a user