]> git.mxchange.org Git - simgear.git/commitdiff
Try to discover the most recent Boost version installed in MSVC_ROOT (Windows only)
authorFrederic Bouvier <fredfgfs01@free.fr>
Sun, 2 Sep 2012 10:43:21 +0000 (12:43 +0200)
committerFrederic Bouvier <fredfgfs01@free.fr>
Sun, 2 Sep 2012 10:43:21 +0000 (12:43 +0200)
CMakeLists.txt

index 008d7a9a83e39042a6bfc7c17eb727a85973d28c..d12183e137b718e7d5b3543f80a631e2472dae0c 100644 (file)
@@ -108,7 +108,19 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
 
   set (CMAKE_LIBRARY_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/lib )
   set (CMAKE_INCLUDE_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/include)
-  set (BOOST_ROOT ${MSVC_3RDPARTY_ROOT}/boost_1_44_0)
+  find_path(BOOST_ROOT boost/version.hpp
+                       ${MSVC_3RDPARTY_ROOT}/boost
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_51_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_50_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_49_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_48_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_47_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_46_1
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_46_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_45_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_44_0
+                       )
+  # set (BOOST_ROOT ${MSVC_3RDPARTY_ROOT}/boost_1_44_0)
   message(STATUS "BOOST_ROOT is ${BOOST_ROOT}")
   set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
   set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)