From 06083672573b525793300fd14e63df242c99248c Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 2 Sep 2012 12:44:23 +0200 Subject: [PATCH] Try to discover the most recent Boost version installed in MSVC_ROOT (Windows only) --- CMakeModules/ConfigureMsvc3rdParty.cmake | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CMakeModules/ConfigureMsvc3rdParty.cmake b/CMakeModules/ConfigureMsvc3rdParty.cmake index 1230ef30b..f46d51d06 100644 --- a/CMakeModules/ConfigureMsvc3rdParty.cmake +++ b/CMakeModules/ConfigureMsvc3rdParty.cmake @@ -36,7 +36,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 ${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 (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 + ) + 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) endif (MSVC AND MSVC_3RDPARTY_ROOT)