From 1c4ba48e4417c60abb1b0da0e9dd270e06a893d5 Mon Sep 17 00:00:00 2001
From: Mateusz Loskot <mateusz@loskot.net>
Date: Thu, 10 Nov 2011 02:04:25 +0000
Subject: FindBoost: Use MSVC11 to find Boost on Windows (#12568)

While at it, add recent Boost versions.
---
 Modules/FindBoost.cmake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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)
-- 
cgit v0.12