if (MSVC AND MSVC_3RDPARTY_ROOT)
message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_ROOT}")
set( OSG_MSVC "msvc" )
- if (${MSVC_VERSION} EQUAL 1600)
+ if (${MSVC_VERSION} EQUAL 1700)
+ set( OSG_MSVC ${OSG_MSVC}110 )
+ elseif (${MSVC_VERSION} EQUAL 1600)
set( OSG_MSVC ${OSG_MSVC}100 )
- else (${MSVC_VERSION} EQUAL 1600)
+ else (${MSVC_VERSION} EQUAL 1700)
set( OSG_MSVC ${OSG_MSVC}90 )
- endif (${MSVC_VERSION} EQUAL 1600)
+ endif (${MSVC_VERSION} EQUAL 1700)
if (CMAKE_CL_64)
set( OSG_MSVC ${OSG_MSVC}-64 )
set( MSVC_3RDPARTY_DIR 3rdParty.x64 )
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)
# SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
# endforeach(warning)
- set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996")
+ set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996 /wd4250")
endif(MSVC)
# assumed on Windows