[Cmake-commits] CMake branch, next, updated. v2.8.6-1833-ga0cadef

Brad King brad.king at kitware.com
Thu Nov 10 08:04:44 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  a0cadefcf9ebd1a5ee51155de232c7c564eab617 (commit)
       via  1c4ba48e4417c60abb1b0da0e9dd270e06a893d5 (commit)
      from  63edbfcf572fb930a5d03b4af6e4b72e4e2bee7d (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=a0cadefcf9ebd1a5ee51155de232c7c564eab617
commit a0cadefcf9ebd1a5ee51155de232c7c564eab617
Merge: 63edbfc 1c4ba48
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 08:04:39 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 10 08:04:39 2011 -0500

    Merge topic 'FindBoost-vs11-issue-12568' into next
    
    1c4ba48 FindBoost: Use MSVC11 to find Boost on Windows (#12568)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c4ba48e4417c60abb1b0da0e9dd270e06a893d5
commit 1c4ba48e4417c60abb1b0da0e9dd270e06a893d5
Author:     Mateusz Loskot <mateusz at loskot.net>
AuthorDate: Thu Nov 10 02:04:25 2011 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 10 08:03:17 2011 -0500

    FindBoost: Use MSVC11 to find Boost on Windows (#12568)
    
    While at it, add recent Boost versions.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 5ccbd6b..ea60354 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -65,7 +65,7 @@
 # 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.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0,
-# 1.45, 1.45.0, 1.46, 1.46.0, 1.46.1
+# 1.45, 1.45.0, 1.46, 1.46.0, 1.46.1, 1.47, 1.47.0, 1.48, 1.48.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
@@ -449,7 +449,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.46.1"
+    "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"
     "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "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"
@@ -750,10 +750,12 @@ else(_boost_IN_CACHE)
       else()
         set (_boost_COMPILER "-il")
       endif()
-    elseif (MSVC90)
-      set(_boost_COMPILER "-vc90")
+    elseif (MSVC11)
+      set(_boost_COMPILER "-vc110")
     elseif (MSVC10)
       set(_boost_COMPILER "-vc100")
+    elseif (MSVC90)
+      set(_boost_COMPILER "-vc90")
     elseif (MSVC80)
       set(_boost_COMPILER "-vc80")
     elseif (MSVC71)

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

Summary of changes:
 Modules/FindBoost.cmake |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list