[Cmake-commits] CMake branch, next, updated. v2.8.8-3255-g6930552

[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  693055255a63f1cc4cd2ffec7b8daf8e2aadd151 (commit)
       via  188b96b100e1b44f9121081f3e29edbfa8354c19 (commit)
      from  ff9909535415436f5300f5dc6a26467cfd6a1532 (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=693055255a63f1cc4cd2ffec7b8daf8e2aadd151
commit 693055255a63f1cc4cd2ffec7b8daf8e2aadd151
Merge: ff99095 188b96b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jun 19 15:05:32 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 19 15:05:32 2012 -0400

    Merge topic 'fix-typos' into next
    
    188b96b fix some typos


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=188b96b100e1b44f9121081f3e29edbfa8354c19
commit 188b96b100e1b44f9121081f3e29edbfa8354c19
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Mar 26 16:21:23 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jun 19 21:05:14 2012 +0200

    fix some typos

diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake
index 50eb787..84ed3ca 100644
--- a/Modules/FindArmadillo.cmake
+++ b/Modules/FindArmadillo.cmake
@@ -74,7 +74,7 @@ endif (ARMADILLO_INCLUDE_DIR)
 #======================
 
 
-# Checks 'RECQUIRED', 'QUIET' and versions.
+# Checks 'REQUIRED', 'QUIET' and versions.
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Armadillo
   REQUIRED_VARS ARMADILLO_LIBRARY ARMADILLO_INCLUDE_DIR
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 9f8d575..56a92c1 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -540,7 +540,7 @@ set (CUDA_INCLUDE_DIRS ${CUDA_TOOLKIT_INCLUDE})
 
 macro(FIND_LIBRARY_LOCAL_FIRST _var _names _doc)
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    # CUDA 3.2+ on Windows moved the library directoryies, so we need the new
+    # CUDA 3.2+ on Windows moved the library directories, so we need the new
     # and old paths.
     set(_cuda_64bit_lib_dir "lib/x64" "lib64" )
   endif()
diff --git a/Modules/FindwxWindows.cmake b/Modules/FindwxWindows.cmake
index f55cf00..dfb28ff 100644
--- a/Modules/FindwxWindows.cmake
+++ b/Modules/FindwxWindows.cmake
@@ -139,7 +139,7 @@ IF(WIN32_STYLE_FIND)
   ## find libs for combination of static/shared with release/debug
   ## be careful if you add something here,
   ## avoid mixing of headers and libs of different wx versions,
-  ## there may be multiple WX version s installed.
+  ## there may be multiple WX versions installed.
   SET (WXWINDOWS_POSSIBLE_LIB_PATHS
     "${WXWINDOWS_ROOT_DIR}/lib"
     )

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

Summary of changes:
 Modules/FindArmadillo.cmake |    2 +-
 Modules/FindCUDA.cmake      |    2 +-
 Modules/FindwxWindows.cmake |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake