[Cmake-commits] CMake branch, next, updated. v2.8.4-1326-g3805411

[Clement Creusot]

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  3805411731094158b436c97cd2b585f076775d3d (commit)
       via  2d56f0adb2001978cc24d865cf2bb049b6aaad9a (commit)
      from  f32e4ff62d614c1609247453902427b4dc292c09 (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=3805411731094158b436c97cd2b585f076775d3d
commit 3805411731094158b436c97cd2b585f076775d3d
Merge: f32e4ff 2d56f0a
Author:     Clement Creusot <creusot at cs.york.ac.uk>
AuthorDate: Fri Apr 1 15:00:46 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 1 15:00:46 2011 -0400

    Merge topic 'module-armadillo' into next
    
    2d56f0a Corrected copyright format in FindArmadillo.cmake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d56f0adb2001978cc24d865cf2bb049b6aaad9a
commit 2d56f0adb2001978cc24d865cf2bb049b6aaad9a
Author:     Clement Creusot <creusot at cs.york.ac.uk>
AuthorDate: Fri Apr 1 19:59:35 2011 +0100
Commit:     Clement Creusot <creusot at cs.york.ac.uk>
CommitDate: Fri Apr 1 19:59:35 2011 +0100

    Corrected copyright format in FindArmadillo.cmake

diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake
index dca0377..6df2473 100644
--- a/Modules/FindArmadillo.cmake
+++ b/Modules/FindArmadillo.cmake
@@ -1,8 +1,9 @@
-# - Try to find Armadillo include dirs and libraries
-# Usage of this module as follows:
+# - Find Armadillo
+# Find the Armadillo C++ library
+#
 #
 # == Using Armadillo: ==
-#  find_package( Armadillo RECQUIRED )
+#  find_package(Armadillo RECQUIRED)
 #  include_directories(${ARMADILLO_INCLUDE_DIRS})
 #  add_executable(foo foo.cc)
 #  target_link_libraries(foo ${ARMADILLO_LIBRARIES})
@@ -19,8 +20,9 @@
 #  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
+# Copyright 2011 Clement Creusot <creusot at cs.york.ac.uk>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -28,8 +30,10 @@
 # This software is distributed WITHOUT ANY WARRANTY; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the License for more information.
-#
 #=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
 
 # UNIX paths are standard, no need to write.
 find_library(ARMADILLO_LIBRARY

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

Summary of changes:
 Modules/FindArmadillo.cmake |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake