[Cmake-commits] CMake branch, next, updated. v2.8.4-986-g1929bb2
Brad King
brad.king at kitware.com
Tue Feb 22 17:29:30 EST 2011
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 1929bb27a92aeb99edf25684d0a0583ea0090d8b (commit)
via 7c5e412c4aa65557c1d59881447d368405801c40 (commit)
from 0ae4931e93e3ad3360f10543c9581095ccb31bc5 (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=1929bb27a92aeb99edf25684d0a0583ea0090d8b
commit 1929bb27a92aeb99edf25684d0a0583ea0090d8b
Merge: 0ae4931 7c5e412
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 22 17:29:25 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 22 17:29:25 2011 -0500
Merge topic 'doc-typo-fixes' into next
7c5e412 Documentation: Fix a few typos (#11883)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c5e412c4aa65557c1d59881447d368405801c40
commit 7c5e412c4aa65557c1d59881447d368405801c40
Author: Modestas Vainius <modax at debian.org>
AuthorDate: Tue Feb 22 17:24:22 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 22 17:24:51 2011 -0500
Documentation: Fix a few typos (#11883)
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 10029: warning [p 158, 13.5i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz informations information
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz dependant dependent
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/cmake prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/cpack prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/ctest prefered preferred
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakepolicies.1.gz prefered preferred
I: cmake-curses-gui: spelling-error-in-binary ./usr/bin/ccmake prefered preferred
I: cmake-qt-gui: spelling-error-in-binary ./usr/bin/cmake-gui prefered preferred
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 98d40d6..6c3398e 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -60,7 +60,7 @@
# CPACK_DEBIAN_PACKAGE_DEBUG
# Mandatory : NO
# Default : -
-# May be set when invoking cpack in order to trace debug informations
+# May be set when invoking cpack in order to trace debug information
# during CPackDeb run.
# CPACK_DEBIAN_PACKAGE_PREDEPENDS
# Mandatory : NO
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 6455c99..96b6741 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -1,6 +1,4 @@
-# Find the PostgreSQL installation.
-#
-# ----------------------------------------------------------------------------
+# - Find the PostgreSQL installation.
# Usage:
# In your CMakeLists.txt file do something like this:
# ...
diff --git a/Modules/UsewxWidgets.cmake b/Modules/UsewxWidgets.cmake
index 9ecfff0..a0f2e86 100644
--- a/Modules/UsewxWidgets.cmake
+++ b/Modules/UsewxWidgets.cmake
@@ -6,7 +6,7 @@
# # Note that for MinGW users the order of libs is important!
# FIND_PACKAGE(wxWidgets REQUIRED net gl core base)
# INCLUDE(${wxWidgets_USE_FILE})
-# # and for each of your dependant executable/library targets:
+# # and for each of your dependent executable/library targets:
# TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
#
# DEPRECATED
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 2d1f792..37070b6 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -453,7 +453,7 @@ cmPolicies::cmPolicies()
"Starting with CMake 2.8.4, if a cmake-module shipped with CMake (i.e. "
"located in the CMake module directory) calls include() or "
"find_package(), the files located in the the CMake module directory are "
- "prefered over the files in CMAKE_MODULE_PATH. "
+ "preferred over the files in CMAKE_MODULE_PATH. "
"This makes sure that the modules belonging to "
"CMake always get those files included which they expect, and against "
"which they were developed and tested. "
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index b0e20ba..3b1f016 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -326,7 +326,7 @@ public:
*/
bool FindSourceFiles();
- ///! Return the prefered linker language for this target
+ ///! Return the preferred linker language for this target
const char* GetLinkerLanguage(const char* config = 0);
///! Return the rule variable used to create this type of target,
diff --git a/Utilities/cmcurl/easy.c b/Utilities/cmcurl/easy.c
index f3c2273..209d1c3 100644
--- a/Utilities/cmcurl/easy.c
+++ b/Utilities/cmcurl/easy.c
@@ -708,7 +708,7 @@ void curl_easy_reset(CURL *curl)
data->set.ssl.verifypeer = TRUE;
data->set.ssl.verifyhost = 2;
#ifdef CURL_CA_BUNDLE
- /* This is our prefered CA cert bundle since install time */
+ /* This is our preferred CA cert bundle since install time */
data->set.ssl.CAfile = (char *)CURL_CA_BUNDLE;
#endif
diff --git a/Utilities/cmcurl/setup.h b/Utilities/cmcurl/setup.h
index e302f35..5ae881f 100644
--- a/Utilities/cmcurl/setup.h
+++ b/Utilities/cmcurl/setup.h
@@ -155,7 +155,7 @@ typedef unsigned char bool;
#define SIZEOF_CURL_OFF_T 4
#endif
-/* We set up our internal prefered (CURL_)FORMAT_OFF_T here */
+/* We set up our internal preferred (CURL_)FORMAT_OFF_T here */
#if SIZEOF_CURL_OFF_T > 4
#define FORMAT_OFF_T "lld"
#else
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackDeb.cmake | 2 +-
Modules/FindPostgreSQL.cmake | 4 +---
Modules/UsewxWidgets.cmake | 2 +-
Source/cmPolicies.cxx | 2 +-
Source/cmTarget.h | 2 +-
Utilities/cmcurl/easy.c | 2 +-
Utilities/cmcurl/setup.h | 2 +-
7 files changed, 7 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list