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

Fix spelling and typos (affecting users)

This commit is contained in:
Andreas Mohr 2013-05-01 10:30:46 +02:00 committed by Brad King
parent b7593bf3f5
commit 86832cecd5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmAddSubDirectoryCommand.h
View File

@ -61,7 +61,7 @@ public:
" add_subdirectory(source_dir [binary_dir] \n" " add_subdirectory(source_dir [binary_dir] \n"
" [EXCLUDE_FROM_ALL])\n" " [EXCLUDE_FROM_ALL])\n"
"Add a subdirectory to the build. The source_dir specifies the " "Add a subdirectory to the build. The source_dir specifies the "
"directory in which the source CmakeLists.txt and code files are " "directory in which the source CMakeLists.txt and code files are "
"located. If it is a relative " "located. If it is a relative "
"path it will be evaluated with respect to the current " "path it will be evaluated with respect to the current "
"directory (the typical usage), but it may also be an absolute path. " "directory (the typical usage), but it may also be an absolute path. "

14
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -202,7 +202,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
stampName += "/"; stampName += "/";
stampName += "generate.stamp"; stampName += "generate.stamp";
std::ofstream stamp(stampName.c_str()); std::ofstream stamp(stampName.c_str());
stamp << "# CMake generation timestamp file this directory.\n"; stamp << "# CMake generation timestamp file for this directory.\n";
// Create a helper file so CMake can determine when it is run // Create a helper file so CMake can determine when it is run
// through the rule created by CreateVCProjBuildRule whether it // through the rule created by CreateVCProjBuildRule whether it
@ -443,12 +443,12 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFlagTable[] =
{"InlineFunctionExpansion", "Ob0", "no inlines", "0", 0}, {"InlineFunctionExpansion", "Ob0", "no inlines", "0", 0},
{"InlineFunctionExpansion", "Ob1", "when inline keyword", "1", 0}, {"InlineFunctionExpansion", "Ob1", "when inline keyword", "1", 0},
{"InlineFunctionExpansion", "Ob2", "any time you can inline", "2", 0}, {"InlineFunctionExpansion", "Ob2", "any time you can inline", "2", 0},
{"RuntimeLibrary", "MTd", "Multithreded debug", "1", 0}, {"RuntimeLibrary", "MTd", "Multithreaded debug", "1", 0},
{"RuntimeLibrary", "MT", "Multithreded", "0", 0}, {"RuntimeLibrary", "MT", "Multithreaded", "0", 0},
{"RuntimeLibrary", "MDd", "Multithreded dll debug", "3", 0}, {"RuntimeLibrary", "MDd", "Multithreaded dll debug", "3", 0},
{"RuntimeLibrary", "MD", "Multithreded dll", "2", 0}, {"RuntimeLibrary", "MD", "Multithreaded dll", "2", 0},
{"RuntimeLibrary", "MLd", "Sinble Thread debug", "5", 0}, {"RuntimeLibrary", "MLd", "Single Thread debug", "5", 0},
{"RuntimeLibrary", "ML", "Sinble Thread", "4", 0}, {"RuntimeLibrary", "ML", "Single Thread", "4", 0},
{"StructMemberAlignment", "Zp16", "struct align 16 byte ", "5", 0}, {"StructMemberAlignment", "Zp16", "struct align 16 byte ", "5", 0},
{"StructMemberAlignment", "Zp1", "struct align 1 byte ", "1", 0}, {"StructMemberAlignment", "Zp1", "struct align 1 byte ", "1", 0},
{"StructMemberAlignment", "Zp2", "struct align 2 byte ", "2", 0}, {"StructMemberAlignment", "Zp2", "struct align 2 byte ", "2", 0},

4
Source/cmake.cxx
View File

@ -128,7 +128,7 @@ void cmNeedBackwardsCompatibility(const std::string& variable,
"by CMake in versions prior to 1.6. To fix this you might need to set " "by CMake in versions prior to 1.6. To fix this you might need to set "
"the cache value of CMAKE_BACKWARDS_COMPATIBILITY to 1.4 or less. If " "the cache value of CMAKE_BACKWARDS_COMPATIBILITY to 1.4 or less. If "
"you are writing a CMakeLists file, (or have already set " "you are writing a CMakeLists file, (or have already set "
"CMAKE_BACKWARDS_COMPATABILITY to 1.4 or less) then you probably need " "CMAKE_BACKWARDS_COMPATIBILITY to 1.4 or less) then you probably need "
"to include a CMake module to test for the feature this variable " "to include a CMake module to test for the feature this variable "
"defines."; "defines.";
cmSystemTools::Error(message.c_str()); cmSystemTools::Error(message.c_str());
@ -4045,7 +4045,7 @@ static bool cmakeCheckStampFile(const char* stampName)
// TODO: Teach cmGeneratedFileStream to use a random temp file (with // TODO: Teach cmGeneratedFileStream to use a random temp file (with
// multiple tries in unlikely case of conflict) and use that here. // multiple tries in unlikely case of conflict) and use that here.
std::ofstream stamp(stampTemp); std::ofstream stamp(stampTemp);
stamp << "# CMake generation timestamp file this directory.\n"; stamp << "# CMake generation timestamp file for this directory.\n";
} }
if(cmSystemTools::RenameFile(stampTemp, stampName)) if(cmSystemTools::RenameFile(stampTemp, stampName))
{ {