[Cmake-commits] CMake branch, next, updated. v2.8.4-1778-g4dfc060

[Brad King]

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  4dfc060b5ba2e14f629e1842892940f8563f735d (commit)
       via  d66459be8ba7928e645e8542195e8a1323e1562a (commit)
      from  75a5cffcc0d05aaf7091cd477739c7a11a232f92 (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=4dfc060b5ba2e14f629e1842892940f8563f735d
commit 4dfc060b5ba2e14f629e1842892940f8563f735d
Merge: 75a5cff d66459b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jun 19 18:15:20 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 19 18:15:20 2011 -0400

    Merge topic 'doc-spelling-formatting-issue-12287' into next
    
    d66459b Documentation: Fix spelling / formatting errors (#12287)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d66459be8ba7928e645e8542195e8a1323e1562a
commit d66459be8ba7928e645e8542195e8a1323e1562a
Author:     Modestas Vainius <modax at debian.org>
AuthorDate: Sun Jun 19 18:05:14 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Jun 19 18:08:05 2011 -0400

    Documentation: Fix spelling / formatting errors (#12287)
    
    The patch fixes the following problems spotted by lintian:
    
    W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2641: warning [p 39, 1.5i]: can't break line
    I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz explict explicit
    I: cmake: spelling-error-in-binary usr/bin/cmake explict explicit
    I: cmake: spelling-error-in-binary usr/bin/cpack explict explicit
    I: cmake: spelling-error-in-binary usr/bin/ctest explict explicit
    W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 7300: warning [p 120, 3.3i]: can't break line
    I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explict explicit
    I: cmake-curses-gui: spelling-error-in-binary usr/bin/ccmake explict explicit
    I: cmake-qt-gui: spelling-error-in-binary usr/bin/cmake-gui explict explicit

diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake
index 6df2473..50eb787 100644
--- a/Modules/FindArmadillo.cmake
+++ b/Modules/FindArmadillo.cmake
@@ -1,15 +1,11 @@
 # - Find Armadillo
 # Find the Armadillo C++ library
 #
-#
-# == Using Armadillo: ==
-#  find_package(Armadillo RECQUIRED)
+# Using Armadillo:
+#  find_package(Armadillo REQUIRED)
 #  include_directories(${ARMADILLO_INCLUDE_DIRS})
 #  add_executable(foo foo.cc)
 #  target_link_libraries(foo ${ARMADILLO_LIBRARIES})
-#
-#=============================================================================
-#
 # This module sets the following variables:
 #  ARMADILLO_FOUND - set to true if the library is found
 #  ARMADILLO_INCLUDE_DIRS - list of required include directories
@@ -19,7 +15,6 @@
 #  ARMADILLO_VERSION_PATCH - patch version number
 #  ARMADILLO_VERSION_STRING - version number as a string (ex: "1.0.4")
 #  ARMADILLO_VERSION_NAME - name of the version (ex: "Antipodean Antileech")
-#
 
 #=============================================================================
 # Copyright 2011 Clement Creusot <creusot at cs.york.ac.uk>
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 342c217..1021bf2 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -69,7 +69,7 @@ We can also infer the edge
 because *every* time A appears B is seen on its right.  We do not know
 whether A really needs symbols from B to link, but it *might* so we
 must preserve their order.  This is the case also for the following
-explict lists:
+explicit lists:
 
   X: A B Y
   Y: A B
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7bd5372..52b9072 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -590,7 +590,7 @@ void cmTarget::DefineProperties(cmake *cm)
      "For an executable with exports (see the ENABLE_EXPORTS property) "
      "no default transitive link dependencies are used.  "
      "This property replaces the default transitive link dependencies with "
-     "an explict list.  "
+     "an explicit list.  "
      "When the target is linked into another target the libraries "
      "listed (and recursively their link interface libraries) will be "
      "provided to the other target also.  "

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

Summary of changes:
 Modules/FindArmadillo.cmake     |    9 ++-------
 Source/cmComputeLinkDepends.cxx |    2 +-
 Source/cmTarget.cxx             |    2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake