summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-08-13 13:27:48 -0400
committerCMake Topic Stage <kwrobot@kitware.com>2012-08-13 13:27:48 -0400
commit4bdbdfbfefa7bd492530bd5db1152bb02765fb81 (patch)
treec4c305f5fae153408d63880b51b63d41d827f71c
parent92b11383d9507d157fb323faba0784bb3afca57f (diff)
parent6c8722fab592ca63d0b85f86ec91ec75e6e66dea (diff)
downloadcmake-4bdbdfbfefa7bd492530bd5db1152bb02765fb81.tar.gz
Merge topic 'directory-typo'
6c8722f Fix typo direcotry -> directory (and similar) [#13444]
-rw-r--r--Modules/FindKDE3.cmake2
-rw-r--r--Modules/FindQt4.cmake2
-rw-r--r--Source/cmake.cxx4
-rw-r--r--Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c2
-rw-r--r--Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindKDE3.cmake b/Modules/FindKDE3.cmake
index 9d1081405e..ca3dae646e 100644
--- a/Modules/FindKDE3.cmake
+++ b/Modules/FindKDE3.cmake
@@ -131,7 +131,7 @@ ENDIF(KDECONFIG_EXECUTABLE)
-# at first the KDE include direcory
+# at first the KDE include directory
# kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore
FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
HINTS
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 2f1708d70e..d157dabaac 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -70,7 +70,7 @@
#
# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
# create moc code from a list of files containing Qt class with
-# the Q_OBJECT declaration. Per-direcotry preprocessor definitions
+# the Q_OBJECT declaration. Per-directory preprocessor definitions
# are also added. Options may be given to moc, such as those found
# when executing "moc -help".
#
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 24ac96610e..75aa4712ca 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1043,7 +1043,7 @@ int cmake::AddCMakePaths()
{
cMakeRoot = cMakeRoot.substr(0, slashPos);
}
- // is there no Modules direcory there?
+ // is there no Modules directory there?
modules = cMakeRoot + "/Modules/CMake.cmake";
}
@@ -1072,7 +1072,7 @@ int cmake::AddCMakePaths()
{
// next try exe
cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str());
- // is there no Modules direcory there?
+ // is there no Modules directory there?
modules = cMakeRoot + "/Modules/CMake.cmake";
}
if (!cmSystemTools::FileExists(modules.c_str()))
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c b/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
index 7d7eecadc8..365a874a9e 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
@@ -925,7 +925,7 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry)
if (fd < 0)
tree_enter_working_dir(t);
- /* The current direcotry fd is needed at
+ /* The current directory fd is needed at
* archive_read_disk_entry_from_file() function to read link data
* with readlinkat(). */
a->entry_wd_fd = tree_current_dir_fd(t);
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c b/Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c
index d8a1f5577b..217a91a868 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c
@@ -955,7 +955,7 @@ _archive_read_disk_open_w(struct archive *_a, const wchar_t *pathname)
a->tree = tree_open(pathname, a->symlink_mode, a->restore_time);
if (a->tree == NULL) {
archive_set_error(&a->archive, ENOMEM,
- "Can't allocate direcotry traversal data");
+ "Can't allocate directory traversal data");
a->archive.state = ARCHIVE_STATE_FATAL;
return (ARCHIVE_FATAL);
}