[Cmake-commits] CMake branch, next, updated. v2.8.2-295-g5514d80
Brad King
brad.king at kitware.com
Wed Jul 28 11:00:41 EDT 2010
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 5514d8031137580ac77d0f5a22a6597d9195f3e6 (commit)
via 2fec61585248f669676c3e4989ffd8349ce8e227 (commit)
from 5b69b6eb7597cfa8e3c5be4b68999c26362242fd (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=5514d8031137580ac77d0f5a22a6597d9195f3e6
commit 5514d8031137580ac77d0f5a22a6597d9195f3e6
Merge: 5b69b6e 2fec615
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 28 11:00:40 2010 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 28 11:00:40 2010 -0400
Merge topic 'find-boost' into next
2fec615 FindBoost: Search for Boost 1.42
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fec61585248f669676c3e4989ffd8349ce8e227
commit 2fec61585248f669676c3e4989ffd8349ce8e227
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 28 10:29:40 2010 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 28 10:29:40 2010 -0400
FindBoost: Search for Boost 1.42
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index ea9eb25..d09c767 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -63,7 +63,7 @@
# Currently this module searches for the following version numbers:
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
-# 1.40, 1.40.0, 1.41, 1.41.0
+# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0
#
# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
# add both 1.x and 1.x.0 as shown above. Official Boost include directories
@@ -297,6 +297,7 @@ else(Boost_FIND_VERSION_EXACT)
# The user has not requested an exact version. Among known
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+ "1.42.0" "1.42"
"1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
"1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
"1.34" "1.33.1" "1.33.0" "1.33")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list