kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix spelling and typos (affecting binary data / module messages)

This commit is contained in:
Andreas Mohr 2013-05-01 11:36:14 +02:00 committed by Brad King
parent 86832cecd5
commit ddac8d3d2d
26 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindCUDA/make2cmake.cmake
View File

@ -63,7 +63,7 @@ if (${depend_text} MATCHES ".+")
if (EXISTS "/${file}") if (EXISTS "/${file}")
set(file "/${file}") set(file "/${file}")
else() else()
message(WARNING " Removing non-existant dependency file: ${file}") message(WARNING " Removing non-existent dependency file: ${file}")
set(file "") set(file "")
endif() endif()
endif() endif()

2
Source/CPack/cmCPackDocumentVariables.cxx
View File

@ -60,7 +60,7 @@ void cmCPackDocumentVariables::DefineVariables(cmake* cm)
"It is usually invoked like this:\n" "It is usually invoked like this:\n"
" make DESTDIR=/home/john install\n" " make DESTDIR=/home/john install\n"
"which will install the concerned software using the" "which will install the concerned software using the"
" installation prefix, e.g. \"/usr/local\" pre-pended with " " installation prefix, e.g. \"/usr/local\" prepended with "
"the DESTDIR value which finally gives \"/home/john/usr/local\"." "the DESTDIR value which finally gives \"/home/john/usr/local\"."
" When preparing a package, CPack first installs the items to be " " When preparing a package, CPack first installs the items to be "
"packaged in a local (to the build tree) directory by using the " "packaged in a local (to the build tree) directory by using the "

2
Source/cmAddDefinitionsCommand.h
View File

@ -63,7 +63,7 @@ public:
"but it was originally intended to add preprocessor definitions. " "but it was originally intended to add preprocessor definitions. "
"Flags beginning in -D or /D that look like preprocessor definitions " "Flags beginning in -D or /D that look like preprocessor definitions "
"are automatically added to the COMPILE_DEFINITIONS property for " "are automatically added to the COMPILE_DEFINITIONS property for "
"the current directory. Definitions with non-trival values may be " "the current directory. Definitions with non-trivial values may be "
"left in the set of flags instead of being converted for reasons of " "left in the set of flags instead of being converted for reasons of "
"backwards compatibility. See documentation of the directory, " "backwards compatibility. See documentation of the directory, "
"target, and source file COMPILE_DEFINITIONS properties for details " "target, and source file COMPILE_DEFINITIONS properties for details "

2
Source/cmCTest.cxx
View File

@ -2413,7 +2413,7 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
#endif #endif
if(retv != 0) if(retv != 0)
{ {
cmCTestLog(this, DEBUG, "build and test failing returing: " << retv cmCTestLog(this, DEBUG, "build and test failing returning: " << retv
<< std::endl); << std::endl);
} }
return retv; return retv;

2
Source/cmCacheManager.cxx
View File

@ -491,7 +491,7 @@ bool cmCacheManager::SaveCache(const char* path)
<< "# The syntax for the file is as follows:\n" << "# The syntax for the file is as follows:\n"
<< "# KEY:TYPE=VALUE\n" << "# KEY:TYPE=VALUE\n"
<< "# KEY is the name of a variable in the cache.\n" << "# KEY is the name of a variable in the cache.\n"
<< "# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT " << "# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT "
"TYPE!." << std::endl "TYPE!." << std::endl
<< "# VALUE is the current value for the KEY.\n\n"; << "# VALUE is the current value for the KEY.\n\n";

2
Source/cmDocumentGeneratorExpressions.h
View File

@ -13,7 +13,7 @@
#define cmDocumentGeneratorExpressions_h #define cmDocumentGeneratorExpressions_h
#define CM_DOCUMENT_ADD_TEST_GENERATOR_EXPRESSIONS \ #define CM_DOCUMENT_ADD_TEST_GENERATOR_EXPRESSIONS \
"Generator expressions are evaluted during build system generation " \ "Generator expressions are evaluated during build system generation " \
"to produce information specific to each build configuration. " \ "to produce information specific to each build configuration. " \
"Valid expressions are:\n" \ "Valid expressions are:\n" \
" $<0:...> = empty string (ignores \"...\")\n" \ " $<0:...> = empty string (ignores \"...\")\n" \

36
Source/cmDocumentVariables.cxx
View File

@ -10,7 +10,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cm->DefineProperty cm->DefineProperty
("CMAKE_AR", cmProperty::VARIABLE, ("CMAKE_AR", cmProperty::VARIABLE,
"Name of archiving tool for static libraries.", "Name of archiving tool for static libraries.",
"This specifies name of the program that creates archive " "This specifies the name of the program that creates archive "
"or static libraries.",false, "or static libraries.",false,
"Variables that Provide Information"); "Variables that Provide Information");
@ -152,7 +152,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cm->DefineProperty cm->DefineProperty
("CMAKE_CACHE_MAJOR_VERSION", cmProperty::VARIABLE, ("CMAKE_CACHE_MAJOR_VERSION", cmProperty::VARIABLE,
"Major version of CMake used to create the CMakeCache.txt file", "Major version of CMake used to create the CMakeCache.txt file",
"This is stores the major version of CMake used to " "This stores the major version of CMake used to "
"write a CMake cache file. It is only different when " "write a CMake cache file. It is only different when "
"a different version of CMake is run on a previously " "a different version of CMake is run on a previously "
"created cache file.", false, "created cache file.", false,
@ -160,7 +160,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cm->DefineProperty cm->DefineProperty
("CMAKE_CACHE_MINOR_VERSION", cmProperty::VARIABLE, ("CMAKE_CACHE_MINOR_VERSION", cmProperty::VARIABLE,
"Minor version of CMake used to create the CMakeCache.txt file", "Minor version of CMake used to create the CMakeCache.txt file",
"This is stores the minor version of CMake used to " "This stores the minor version of CMake used to "
"write a CMake cache file. It is only different when " "write a CMake cache file. It is only different when "
"a different version of CMake is run on a previously " "a different version of CMake is run on a previously "
"created cache file.", false, "created cache file.", false,
@ -169,7 +169,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cm->DefineProperty cm->DefineProperty
("CMAKE_CACHE_PATCH_VERSION", cmProperty::VARIABLE, ("CMAKE_CACHE_PATCH_VERSION", cmProperty::VARIABLE,
"Patch version of CMake used to create the CMakeCache.txt file", "Patch version of CMake used to create the CMakeCache.txt file",
"This is stores the patch version of CMake used to " "This stores the patch version of CMake used to "
"write a CMake cache file. It is only different when " "write a CMake cache file. It is only different when "
"a different version of CMake is run on a previously " "a different version of CMake is run on a previously "
"created cache file.", false, "created cache file.", false,
@ -616,7 +616,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
("CMAKE_INSTALL_PREFIX", cmProperty::VARIABLE, ("CMAKE_INSTALL_PREFIX", cmProperty::VARIABLE,
"Install directory used by install.", "Install directory used by install.",
"If \"make install\" is invoked or INSTALL is built" "If \"make install\" is invoked or INSTALL is built"
", this directory is pre-pended onto all install " ", this directory is prepended onto all install "
"directories. This variable defaults to /usr/local" "directories. This variable defaults to /usr/local"
" on UNIX and c:/Program Files on Windows.\n" " on UNIX and c:/Program Files on Windows.\n"
"On UNIX one can use the DESTDIR mechanism in order" "On UNIX one can use the DESTDIR mechanism in order"
@ -627,11 +627,11 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"It is usually invoked like this:\n" "It is usually invoked like this:\n"
" make DESTDIR=/home/john install\n" " make DESTDIR=/home/john install\n"
"which will install the concerned software using the" "which will install the concerned software using the"
" installation prefix, e.g. \"/usr/local\" pre-pended with " " installation prefix, e.g. \"/usr/local\" prepended with "
"the DESTDIR value which finally gives \"/home/john/usr/local\".\n" "the DESTDIR value which finally gives \"/home/john/usr/local\".\n"
"WARNING: DESTDIR may not be used on Windows because installation" "WARNING: DESTDIR may not be used on Windows because installation"
" prefix usually contains a drive letter like in \"C:/Program Files\"" " prefix usually contains a drive letter like in \"C:/Program Files\""
" which cannot be pre-pended with some other prefix." " which cannot be prepended with some other prefix."
,false, ,false,
"Variables That Change Behavior"); "Variables That Change Behavior");
@ -792,7 +792,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"This switch should be used during the initial CMake run. Otherwise if " "This switch should be used during the initial CMake run. Otherwise if "
"the package has already been found in a previous CMake run, the " "the package has already been found in a previous CMake run, the "
"variables which have been stored in the cache will still be there. " "variables which have been stored in the cache will still be there. "
"In the case it is recommended to remove the cache variables for " "In that case it is recommended to remove the cache variables for "
"this package from the cache using the cache editor or cmake -U", false, "this package from the cache using the cache editor or cmake -U", false,
"Variables That Change Behavior"); "Variables That Change Behavior");
@ -888,7 +888,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
" an ABSOLUTE DESTINATION path.", " an ABSOLUTE DESTINATION path.",
"This variable is defined by CMake-generated cmake_install.cmake " "This variable is defined by CMake-generated cmake_install.cmake "
"scripts." "scripts."
" It can be used (read-only) by program or script that source those" " It can be used (read-only) by programs or scripts that source those"
" install scripts. This is used by some CPack generators (e.g. RPM).", " install scripts. This is used by some CPack generators (e.g. RPM).",
false, false,
"Variables That Change Behavior"); "Variables That Change Behavior");
@ -898,7 +898,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"Ask cmake_install.cmake script to warn each time a file with " "Ask cmake_install.cmake script to warn each time a file with "
"absolute INSTALL DESTINATION is encountered.", "absolute INSTALL DESTINATION is encountered.",
"This variable is used by CMake-generated cmake_install.cmake" "This variable is used by CMake-generated cmake_install.cmake"
" scripts. If ones set this variable to ON while running the" " scripts. If one sets this variable to ON while running the"
" script, it may get warning messages from the script.", false, " script, it may get warning messages from the script.", false,
"Variables That Change Behavior"); "Variables That Change Behavior");
@ -909,7 +909,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"The fatal error is emitted before the installation of " "The fatal error is emitted before the installation of "
"the offending file takes place." "the offending file takes place."
" This variable is used by CMake-generated cmake_install.cmake" " This variable is used by CMake-generated cmake_install.cmake"
" scripts. If ones set this variable to ON while running the" " scripts. If one sets this variable to ON while running the"
" script, it may get fatal error messages from the script.",false, " script, it may get fatal error messages from the script.",false,
"Variables That Change Behavior"); "Variables That Change Behavior");
@ -1395,7 +1395,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cm->DefineProperty cm->DefineProperty
("CMAKE_USE_RELATIVE_PATHS", cmProperty::VARIABLE, ("CMAKE_USE_RELATIVE_PATHS", cmProperty::VARIABLE,
"Use relative paths (May not work!).", "Use relative paths (May not work!).",
"If this is set to TRUE, then the CMake will use " "If this is set to TRUE, then CMake will use "
"relative paths between the source and binary tree. " "relative paths between the source and binary tree. "
"This option does not work for more complicated " "This option does not work for more complicated "
"projects, and relative paths are used when possible. " "projects, and relative paths are used when possible. "
@ -1591,7 +1591,8 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
("CMAKE_<LANG>_COMPILE_OBJECT", cmProperty::VARIABLE, ("CMAKE_<LANG>_COMPILE_OBJECT", cmProperty::VARIABLE,
"Rule variable to compile a single object file.", "Rule variable to compile a single object file.",
"This is a rule variable that tells CMake how to " "This is a rule variable that tells CMake how to "
"compile a single object file for for the language <LANG>.",false, "compile a single object file for the language <LANG>."
,false,
"Variables for Languages"); "Variables for Languages");
cm->DefineProperty cm->DefineProperty
@ -1727,8 +1728,9 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cm->DefineProperty cm->DefineProperty
("CMAKE_<LANG>_LINK_EXECUTABLE ", cmProperty::VARIABLE, ("CMAKE_<LANG>_LINK_EXECUTABLE ", cmProperty::VARIABLE,
"Rule variable to link and executable.", "Rule variable to link an executable.",
"Rule variable to link and executable for the given language.",false, "Rule variable to link an executable for the given language."
,false,
"Variables for Languages"); "Variables for Languages");
cm->DefineProperty cm->DefineProperty
@ -1742,7 +1744,9 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
("CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS", cmProperty::VARIABLE, ("CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS", cmProperty::VARIABLE,
"Extensions of source files for the given language.", "Extensions of source files for the given language.",
"This is the list of extensions for a " "This is the list of extensions for a "
"given languages source files.",false,"Variables for Languages"); "given language's source files."
,false,
"Variables for Languages");
cm->DefineProperty( cm->DefineProperty(
"CMAKE_<LANG>_COMPILER_LOADED", cmProperty::VARIABLE, "CMAKE_<LANG>_COMPILER_LOADED", cmProperty::VARIABLE,

4
Source/cmDocumentation.cxx
View File

@ -53,7 +53,7 @@ static const char *cmModulesDocumentationDescription[][3] =
"This is the documentation for the modules and scripts coming with CMake. " "This is the documentation for the modules and scripts coming with CMake. "
"Using these modules you can check the computer system for " "Using these modules you can check the computer system for "
"installed software packages, features of the compiler and the " "installed software packages, features of the compiler and the "
"existance of headers to name just a few.", 0}, "existence of headers to name just a few.", 0},
{0,0,0} {0,0,0}
}; };
@ -67,7 +67,7 @@ static const char *cmCustomModulesDocumentationDescription[][3] =
"This is the documentation for additional modules and scripts for CMake. " "This is the documentation for additional modules and scripts for CMake. "
"Using these modules you can check the computer system for " "Using these modules you can check the computer system for "
"installed software packages, features of the compiler and the " "installed software packages, features of the compiler and the "
"existance of headers to name just a few.", 0}, "existence of headers to name just a few.", 0},
{0,0,0} {0,0,0}
}; };

2
Source/cmExportCommand.cxx
View File

@ -210,7 +210,7 @@ bool cmExportCommand::HandlePackage(std::vector<std::string> const& args)
else else
{ {
cmOStringStream e; cmOStringStream e;
e << "PACKAGE given unknown argumsnt: " << args[i]; e << "PACKAGE given unknown argument: " << args[i];
this->SetError(e.str().c_str()); this->SetError(e.str().c_str());
return false; return false;
} }

4
Source/cmFileCommand.cxx
View File

@ -1970,7 +1970,7 @@ bool cmFileInstaller
else else
{ {
cmOStringStream e; cmOStringStream e;
e << "Option TYPE given uknown value \"" << stype << "\"."; e << "Option TYPE given unknown value \"" << stype << "\".";
this->FileCommand->SetError(e.str().c_str()); this->FileCommand->SetError(e.str().c_str());
return false; return false;
} }
@ -1985,7 +1985,7 @@ bool cmFileInstaller::HandleInstallDestination()
// allow for / to be a valid destination // allow for / to be a valid destination
if ( destination.size() < 2 && destination != "/" ) if ( destination.size() < 2 && destination != "/" )
{ {
this->FileCommand->SetError("called with inapropriate arguments. " this->FileCommand->SetError("called with inappropriate arguments. "
"No DESTINATION provided or ."); "No DESTINATION provided or .");
return false; return false;
} }

2
Source/cmGlobalGenerator.cxx
View File

@ -423,7 +423,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
{ {
if (this->CMakeInstance->GetIsInTryCompile()) if (this->CMakeInstance->GetIsInTryCompile())
{ {
cmSystemTools::Error("This should not have happen. " cmSystemTools::Error("This should not have happened. "
"If you see this message, you are probably " "If you see this message, you are probably "
"using a broken CMakeLists.txt file or a " "using a broken CMakeLists.txt file or a "
"problematic release of CMake"); "problematic release of CMake");

2
Source/cmLocalGenerator.cxx
View File

@ -294,7 +294,7 @@ void cmLocalGenerator::GenerateTestFiles()
<< "# Build directory: " << "# Build directory: "
<< this->Makefile->GetStartOutputDirectory() << std::endl << this->Makefile->GetStartOutputDirectory() << std::endl
<< "# " << std::endl << "# " << std::endl
<< "# This file includes the relevent testing commands " << "# This file includes the relevant testing commands "
<< "required for " << std::endl << "required for " << std::endl
<< "# testing this directory and lists subdirectories to " << "# testing this directory and lists subdirectories to "
<< "be tested as well." << std::endl; << "be tested as well." << std::endl;

6
Source/cmMakefile.cxx
View File

@ -1436,7 +1436,7 @@ void cmMakefile::AddLinkDirectoryForTarget(const char *target,
else else
{ {
cmSystemTools::Error cmSystemTools::Error
("Attempt to add link directories to non-existant target: ", ("Attempt to add link directories to non-existent target: ",
target, " for directory ", d); target, " for directory ", d);
} }
} }
@ -4043,7 +4043,7 @@ void cmMakefile::DefineProperties(cmake *cm)
"\n" "\n"
"This property only works for Visual Studio 7 and above; it is ignored " "This property only works for Visual Studio 7 and above; it is ignored "
"on other generators. The property only applies when set on a directory " "on other generators. The property only applies when set on a directory "
"whose CMakeLists.txt conatins a project() command."); "whose CMakeLists.txt contains a project() command.");
cm->DefineProperty cm->DefineProperty
("VS_GLOBAL_SECTION_POST_<section>", cmProperty::DIRECTORY, ("VS_GLOBAL_SECTION_POST_<section>", cmProperty::DIRECTORY,
"Specify a postSolution global section in Visual Studio.", "Specify a postSolution global section in Visual Studio.",
@ -4059,7 +4059,7 @@ void cmMakefile::DefineProperties(cmake *cm)
"\n" "\n"
"This property only works for Visual Studio 7 and above; it is ignored " "This property only works for Visual Studio 7 and above; it is ignored "
"on other generators. The property only applies when set on a directory " "on other generators. The property only applies when set on a directory "
"whose CMakeLists.txt conatins a project() command." "whose CMakeLists.txt contains a project() command."
"\n" "\n"
"Note that CMake generates postSolution sections ExtensibilityGlobals " "Note that CMake generates postSolution sections ExtensibilityGlobals "
"and ExtensibilityAddIns by default. If you set the corresponding " "and ExtensibilityAddIns by default. If you set the corresponding "

7
Source/cmPolicies.cxx
View File

@ -440,7 +440,8 @@ cmPolicies::cmPolicies()
this->DefinePolicy( this->DefinePolicy(
CMP0016, "CMP0016", CMP0016, "CMP0016",
"target_link_libraries() reports error if only argument is not a target.", "target_link_libraries() reports error if its only argument "
"is not a target.",
"In CMake 2.8.2 and lower the target_link_libraries() command silently " "In CMake 2.8.2 and lower the target_link_libraries() command silently "
"ignored if it was called with only one argument, and this argument " "ignored if it was called with only one argument, and this argument "
"wasn't a valid target. " "wasn't a valid target. "
@ -452,7 +453,7 @@ cmPolicies::cmPolicies()
"Prefer files from the CMake module directory when including from there.", "Prefer files from the CMake module directory when including from there.",
"Starting with CMake 2.8.4, if a cmake-module shipped with CMake (i.e. " "Starting with CMake 2.8.4, if a cmake-module shipped with CMake (i.e. "
"located in the CMake module directory) calls include() or " "located in the CMake module directory) calls include() or "
"find_package(), the files located in the the CMake module directory are " "find_package(), the files located in the CMake module directory are "
"preferred over the files in CMAKE_MODULE_PATH. " "preferred over the files in CMAKE_MODULE_PATH. "
"This makes sure that the modules belonging to " "This makes sure that the modules belonging to "
"CMake always get those files included which they expect, and against " "CMake always get those files included which they expect, and against "
@ -770,7 +771,7 @@ std::string cmPolicies::GetRequiredPolicyError(cmPolicies::PolicyID id)
{ {
cmSystemTools::Error( cmSystemTools::Error(
"Request for error text for undefined policy!"); "Request for error text for undefined policy!");
return "Request for warning text for undefined policy!"; return "Request for error text for undefined policy!";
} }
cmOStringStream error; cmOStringStream error;

4
Source/cmSourceFile.cxx
View File

@ -483,7 +483,7 @@ void cmSourceFile::DefineProperties(cmake *cm)
"the source file is. If it is not set the language is determined " "the source file is. If it is not set the language is determined "
"based on the file extension. Typical values are CXX C etc. Setting " "based on the file extension. Typical values are CXX C etc. Setting "
"this property for a file means this file will be compiled. " "this property for a file means this file will be compiled. "
"Do not set this for header or files that should not be compiled."); "Do not set this for headers or files that should not be compiled.");
cm->DefineProperty cm->DefineProperty
("LOCATION", cmProperty::SOURCE_FILE, ("LOCATION", cmProperty::SOURCE_FILE,
@ -551,7 +551,7 @@ void cmSourceFile::DefineProperties(cmake *cm)
"Some packages can wrap source files into alternate languages " "Some packages can wrap source files into alternate languages "
"to provide additional functionality. For example, C++ code " "to provide additional functionality. For example, C++ code "
"can be wrapped into Java or Python etc using SWIG etc. " "can be wrapped into Java or Python etc using SWIG etc. "
"If WRAP_EXCLUDE is set to true (1 etc) that indicates then " "If WRAP_EXCLUDE is set to true (1 etc) that indicates that "
"this source file should not be wrapped."); "this source file should not be wrapped.");
} }

2
Source/cmSubdirCommand.cxx
View File

@ -64,7 +64,7 @@ bool cmSubdirCommand
else else
{ {
std::string error = "Incorrect SUBDIRS command. Directory: "; std::string error = "Incorrect SUBDIRS command. Directory: ";
error += *i + " does not exists."; error += *i + " does not exist.";
this->SetError(error.c_str()); this->SetError(error.c_str());
res = false; res = false;
} }

6
Source/cmTarget.cxx
View File

@ -279,7 +279,7 @@ void cmTarget::DefineProperties(cmake *cm)
"If not set here then it is set to target_EXPORTS by default " "If not set here then it is set to target_EXPORTS by default "
"(with some substitutions if the target is not a valid C " "(with some substitutions if the target is not a valid C "
"identifier). This is useful for headers to know whether they are " "identifier). This is useful for headers to know whether they are "
"being included from inside their library our outside to properly " "being included from inside their library or outside to properly "
"setup dllexport/dllimport decorations. "); "setup dllexport/dllimport decorations. ");
cm->DefineProperty cm->DefineProperty
@ -1143,7 +1143,7 @@ void cmTarget::DefineProperties(cmake *cm)
cm->DefineProperty cm->DefineProperty
("MACOSX_FRAMEWORK_INFO_PLIST", cmProperty::TARGET, ("MACOSX_FRAMEWORK_INFO_PLIST", cmProperty::TARGET,
"Specify a custom Info.plist template for a Mac OS X Framework.", "Specify a custom Info.plist template for a Mac OS X Framework.",
"An library target with FRAMEWORK enabled will be built as a " "A library target with FRAMEWORK enabled will be built as a "
"framework on Mac OS X. " "framework on Mac OS X. "
"By default its Info.plist file is created by configuring a template " "By default its Info.plist file is created by configuring a template "
"called MacOSXFrameworkInfo.plist.in located in the CMAKE_MODULE_PATH. " "called MacOSXFrameworkInfo.plist.in located in the CMAKE_MODULE_PATH. "
@ -1234,7 +1234,7 @@ void cmTarget::DefineProperties(cmake *cm)
cm->DefineProperty cm->DefineProperty
("GENERATOR_FILE_NAME", cmProperty::TARGET, ("GENERATOR_FILE_NAME", cmProperty::TARGET,
"Generator's file for this target.", "Generator's file for this target.",
"An internal property used by some generators to record the name of " "An internal property used by some generators to record the name of the "
"project or dsp file associated with this target. Note that at configure " "project or dsp file associated with this target. Note that at configure "
"time, this property is only set for targets created by " "time, this property is only set for targets created by "
"include_external_msproject()."); "include_external_msproject().");

2
Source/cmake.cxx
View File

@ -4173,7 +4173,7 @@ int cmake::VisualStudioLink(std::vector<std::string>& args, int type)
{ {
if(verbose) if(verbose)
{ {
std::cout << "Visual Studio Incremental Link with embeded manifests\n"; std::cout << "Visual Studio Incremental Link with embedded manifests\n";
} }
return cmake::VisualStudioLinkIncremental(expandedArgs, type, verbose); return cmake::VisualStudioLinkIncremental(expandedArgs, type, verbose);
} }

6
Source/cmakemain.cxx
View File

@ -86,8 +86,8 @@ static const char * cmDocumentationOptions[][3] =
{"-L[A][H]", "List non-advanced cached variables.", {"-L[A][H]", "List non-advanced cached variables.",
"List cache variables will run CMake and list all the variables from the " "List cache variables will run CMake and list all the variables from the "
"CMake cache that are not marked as INTERNAL or ADVANCED. This will " "CMake cache that are not marked as INTERNAL or ADVANCED. This will "
"effectively display current CMake settings, which can be then changed " "effectively display current CMake settings, which can then be changed "
"with -D option. Changing some of the variable may result in more " "with -D option. Changing some of the variables may result in more "
"variables being created. If A is specified, then it will display also " "variables being created. If A is specified, then it will display also "
"advanced variables. If H is specified, it will also display help for " "advanced variables. If H is specified, it will also display help for "
"each variable."}, "each variable."},
@ -152,7 +152,7 @@ static const char * cmDocumentationOptions[][3] =
"format is determined depending on the filename suffix. Supported are man " "format is determined depending on the filename suffix. Supported are man "
"page, HTML, DocBook and plain text."}, "page, HTML, DocBook and plain text."},
{"--help-commands [file]", "Print help for all commands and exit.", {"--help-commands [file]", "Print help for all commands and exit.",
"Full documentation specific for all current command is displayed." "Full documentation specific for all current commands is displayed."
"If a file is specified, the documentation is written into and the output " "If a file is specified, the documentation is written into and the output "
"format is determined depending on the filename suffix. Supported are man " "format is determined depending on the filename suffix. Supported are man "
"page, HTML, DocBook and plain text."}, "page, HTML, DocBook and plain text."},

6
Source/ctest.cxx
View File

@ -60,7 +60,7 @@ static const char * cmDocumentationOptions[][3] =
"Test output is normally suppressed and only summary information is " "Test output is normally suppressed and only summary information is "
"displayed. This option will show even more test output."}, "displayed. This option will show even more test output."},
{"--debug", "Displaying more verbose internals of CTest.", {"--debug", "Displaying more verbose internals of CTest.",
"This feature will result in large number of output that is mostly " "This feature will result in a large number of output that is mostly "
"useful for debugging dashboard problems."}, "useful for debugging dashboard problems."},
{"--output-on-failure", "Output anything outputted by the test program " {"--output-on-failure", "Output anything outputted by the test program "
"if the test should fail. This option can also be enabled by setting " "if the test should fail. This option can also be enabled by setting "
@ -99,7 +99,7 @@ static const char * cmDocumentationOptions[][3] =
"This option tells ctest to NOT run the tests whose labels match the " "This option tells ctest to NOT run the tests whose labels match the "
"given regular expression."}, "given regular expression."},
{"-D <dashboard>, --dashboard <dashboard>", "Execute dashboard test", {"-D <dashboard>, --dashboard <dashboard>", "Execute dashboard test",
"This option tells ctest to perform act as a Dart client and perform " "This option tells ctest to act as a Dart client and perform "
"a dashboard test. All tests are <Mode><Test>, where Mode can be " "a dashboard test. All tests are <Mode><Test>, where Mode can be "
"Experimental, Nightly, and Continuous, and Test can be Start, Update, " "Experimental, Nightly, and Continuous, and Test can be Start, Update, "
"Configure, Build, Test, Coverage, and Submit."}, "Configure, Build, Test, Coverage, and Submit."},
@ -171,7 +171,7 @@ static const char * cmDocumentationOptions[][3] =
"to this command line are the source and binary directories. By default " "to this command line are the source and binary directories. By default "
"this will run CMake on the Source/Bin directories specified unless " "this will run CMake on the Source/Bin directories specified unless "
"--build-nocmake is specified. Both --build-makeprogram and " "--build-nocmake is specified. Both --build-makeprogram and "
"--build-generator MUST be provided to use --built-and-test. If " "--build-generator MUST be provided to use --build-and-test. If "
"--test-command is specified then that will be run after the build is " "--test-command is specified then that will be run after the build is "
"complete. Other options that affect this mode are --build-target " "complete. Other options that affect this mode are --build-target "
"--build-nocmake, --build-run-dir, " "--build-nocmake, --build-run-dir, "

4
Tests/CompatibleInterface/CMakeLists.txt
View File

@ -57,10 +57,10 @@ set_property(TARGET iface2 APPEND PROPERTY
# properties defined only in the interface - they should be implicitly zero # properties defined only in the interface - they should be implicitly zero
set_property(TARGET iface2 set_property(TARGET iface2
APPEND PROPERTY APPEND PROPERTY
LINK_INTERFACE_LIBRARIES $<$<BOOL:$<TARGET_PROPERTY:BOOL_PROP4>>:nonexistant> LINK_INTERFACE_LIBRARIES $<$<BOOL:$<TARGET_PROPERTY:BOOL_PROP4>>:nonexistent>
) )
target_link_libraries(CompatibleInterface iface2 target_link_libraries(CompatibleInterface iface2
$<$<BOOL:$<TARGET_PROPERTY:Iface2_PROP>>:nonexistant> $<$<BOOL:$<TARGET_PROPERTY:Iface2_PROP>>:nonexistent>
) )
# Test that this does not segfault: # Test that this does not segfault:
target_compile_definitions(CompatibleInterface target_compile_definitions(CompatibleInterface

2
Tests/ReturnTest/CMakeLists.txt
View File

@ -140,7 +140,7 @@ endwhile()
if ("${iter}" STREQUAL "aaa") if ("${iter}" STREQUAL "aaa")
pass ("break in a while") pass ("break in a while")
else () else ()
failed ("break in a whi;e got: ${whiletestResult}") failed ("break in a while got: ${whiletestResult}")
endif () endif ()

4
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadNonTarget-stderr.txt
View File

@ -1,8 +1,8 @@
CMake Error at BadNonTarget.cmake:7 \(include_directories\): CMake Error at BadNonTarget.cmake:7 \(include_directories\):
Error evaluating generator expression: Error evaluating generator expression:
\$<TARGET_PROPERTY:NonExistant,INCLUDE_DIRECTORIES> \$<TARGET_PROPERTY:NonExistent,INCLUDE_DIRECTORIES>
Target "NonExistant" not found. Target "NonExistent" not found.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:8 \(include\)$ CMakeLists.txt:8 \(include\)$

2
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadNonTarget.cmake
View File

@ -4,4 +4,4 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp"
add_executable(TargetPropertyGeneratorExpressions add_executable(TargetPropertyGeneratorExpressions
"${CMAKE_CURRENT_BINARY_DIR}/main.cpp") "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
include_directories("$<TARGET_PROPERTY:NonExistant,INCLUDE_DIRECTORIES>") include_directories("$<TARGET_PROPERTY:NonExistent,INCLUDE_DIRECTORIES>")

2
Utilities/cmlibarchive/libarchive/archive_write_set_format_7zip.c
View File

@ -385,7 +385,7 @@ _7z_options(struct archive_write *a, const char *key, const char *value)
else { else {
archive_set_error(&(a->archive), archive_set_error(&(a->archive),
ARCHIVE_ERRNO_MISC, ARCHIVE_ERRNO_MISC,
"Unkonwn compression name: `%s'", "Unknown compression name: `%s'",
value); value);
return (ARCHIVE_FAILED); return (ARCHIVE_FAILED);
} }

6
Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c
View File

@ -414,7 +414,7 @@ xar_options(struct archive_write *a, const char *key, const char *value)
else { else {
archive_set_error(&(a->archive), archive_set_error(&(a->archive),
ARCHIVE_ERRNO_MISC, ARCHIVE_ERRNO_MISC,
"Unkonwn checksum name: `%s'", "Unknown checksum name: `%s'",
value); value);
return (ARCHIVE_FAILED); return (ARCHIVE_FAILED);
} }
@ -448,7 +448,7 @@ xar_options(struct archive_write *a, const char *key, const char *value)
else { else {
archive_set_error(&(a->archive), archive_set_error(&(a->archive),
ARCHIVE_ERRNO_MISC, ARCHIVE_ERRNO_MISC,
"Unkonwn compression name: `%s'", "Unknown compression name: `%s'",
value); value);
return (ARCHIVE_FAILED); return (ARCHIVE_FAILED);
} }
@ -485,7 +485,7 @@ xar_options(struct archive_write *a, const char *key, const char *value)
else { else {
archive_set_error(&(a->archive), archive_set_error(&(a->archive),
ARCHIVE_ERRNO_MISC, ARCHIVE_ERRNO_MISC,
"Unkonwn checksum name: `%s'", "Unknown checksum name: `%s'",
value); value);
return (ARCHIVE_FAILED); return (ARCHIVE_FAILED);
} }