fly/flightgear
1
0
Fork 0
Code Activity

Simplify MSVC detection to match SimGear.

Browse source
This commit is contained in:
James Turner 2016-11-15 00:07:32 +01:00
parent 994ea1674b
commit 5d7b65477f
2 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
CMakeModules/ConfigureMsvc3rdParty.cmake
View file

@ -24,10 +24,8 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
set( OSG_MSVC ${OSG_MSVC}140 ) set( OSG_MSVC ${OSG_MSVC}140 )
elseif (${MSVC_VERSION} EQUAL 1800) elseif (${MSVC_VERSION} EQUAL 1800)
set( OSG_MSVC ${OSG_MSVC}120 ) set( OSG_MSVC ${OSG_MSVC}120 )
elseif (${MSVC_VERSION} EQUAL 1700) else ()
set( OSG_MSVC ${OSG_MSVC}110 ) message(FATAL_ERROR "Visual Studio 2013/2015 is required now")
elseif (${MSVC_VERSION} EQUAL 1600)
set( OSG_MSVC ${OSG_MSVC}100 )
endif () endif ()
if (CMAKE_CL_64) if (CMAKE_CL_64)
@ -39,24 +37,18 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
set( BOOST_LIB lib ) set( BOOST_LIB lib )
endif (CMAKE_CL_64) endif (CMAKE_CL_64)
GET_FILENAME_COMPONENT(MSVC_ROOT_PARENT_DIR ${MSVC_3RDPARTY_ROOT} PATH) 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 )
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) 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_ROOT_PARENT_DIR} if(NOT BOOST_INCLUDEDIR)
${MSVC_3RDPARTY_ROOT}/boost # if this variable was not set by the user, set it to 3rdparty root's
${MSVC_3RDPARTY_ROOT}/boost_1_52_0 # parent dir, which is the normal location for people using our
${MSVC_3RDPARTY_ROOT}/boost_1_51_0 # windows-3rd-party repo
${MSVC_3RDPARTY_ROOT}/boost_1_50_0 GET_FILENAME_COMPONENT(MSVC_ROOT_PARENT_DIR ${MSVC_3RDPARTY_ROOT} PATH)
${MSVC_3RDPARTY_ROOT}/boost_1_49_0 set(BOOST_INCLUDEDIR ${MSVC_ROOT_PARENT_DIR})
${MSVC_3RDPARTY_ROOT}/boost_1_48_0 message(STATUS "BOOST_INCLUDEDIR is ${BOOST_INCLUDEDIR}")
${MSVC_3RDPARTY_ROOT}/boost_1_47_0 endif()
${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}")
if (USE_AEONWAVE) if (USE_AEONWAVE)
find_package(AAX COMPONENTS aax REQUIRED) find_package(AAX COMPONENTS aax REQUIRED)
else() else()