]> git.mxchange.org Git - flightgear.git/commitdiff
Look for Boost 1.52.0 and OpenRTI under Windows
authorFrederic Bouvier <fredfgfs01@free.fr>
Sat, 1 Dec 2012 10:25:22 +0000 (11:25 +0100)
committerFrederic Bouvier <fredfgfs01@free.fr>
Sat, 1 Dec 2012 10:26:10 +0000 (11:26 +0100)
CMakeModules/ConfigureMsvc3rdParty.cmake

index 8466184d03b1902f1320420654e7297862834861..25cc7607359cdef89ef7a603ab9553beb1a1aff1 100644 (file)
@@ -36,10 +36,11 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
                set( BOOST_LIB lib )
     endif (CMAKE_CL_64)
 
-    set (CMAKE_LIBRARY_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/lib $(BOOST_ROOT)/$(BOOST_LIB) )
-    set (CMAKE_INCLUDE_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/include)
+    set (CMAKE_LIBRARY_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenRTI/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/lib $(BOOST_ROOT)/$(BOOST_LIB) )
+    set (CMAKE_INCLUDE_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenRTI/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/include)
     find_path(BOOST_ROOT boost/version.hpp
                        ${MSVC_3RDPARTY_ROOT}/boost
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_52_0
                        ${MSVC_3RDPARTY_ROOT}/boost_1_51_0
                        ${MSVC_3RDPARTY_ROOT}/boost_1_50_0
                        ${MSVC_3RDPARTY_ROOT}/boost_1_49_0