[Cmake-commits] CMake branch, next, updated. v2.8.8-3599-g078b8b1

[Rolf Eike Beer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  078b8b15f78e05f80b196c2f02405ff7137ba571 (commit)
       via  6c8722fab592ca63d0b85f86ec91ec75e6e66dea (commit)
       via  8baeeed109f2eb21e94b7ec7a0230030fa7e9a1c (commit)
      from  298ba6f12314e43af95ed9039b714a4157bfdd6d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=078b8b15f78e05f80b196c2f02405ff7137ba571
commit 078b8b15f78e05f80b196c2f02405ff7137ba571
Merge: 298ba6f 6c8722f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jul 30 02:09:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 30 02:09:03 2012 -0400

    Merge topic 'directory-typo' into next
    
    6c8722f Fix typo direcotry -> directory (and similar) [#13444]
    8baeeed CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c8722fab592ca63d0b85f86ec91ec75e6e66dea
commit 6c8722fab592ca63d0b85f86ec91ec75e6e66dea
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jul 30 08:08:33 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jul 30 08:08:33 2012 +0200

    Fix typo direcotry -> directory (and similar) [#13444]

diff --git a/Modules/FindKDE3.cmake b/Modules/FindKDE3.cmake
index 9d10814..ca3dae6 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 2f1708d..d157dab 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 fdc42fa..d841e41 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 7d7eeca..365a874 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 d8a1f55..217a91a 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);
 	}

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindKDE3.cmake                             |    2 +-
 Modules/FindQt4.cmake                              |    2 +-
 Source/CMakeVersion.cmake                          |    2 +-
 Source/cmake.cxx                                   |    4 ++--
 .../libarchive/archive_read_disk_posix.c           |    2 +-
 .../libarchive/archive_read_disk_windows.c         |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake