From: James Turner Date: Sat, 1 Jan 2011 21:06:43 +0000 (+0000) Subject: Cmake: 3RDPARTY_DIR fixes from Olaf Flebbe X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=80161bfa969849913ef3271d889f8a73e1e5f1ae;p=simgear.git Cmake: 3RDPARTY_DIR fixes from Olaf Flebbe --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 974671c7..82008959 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,12 +21,12 @@ option(MSVC_3RDPARTY_DIR "Location where the third-party dependencies are extrac if (MSVC_3RDPARTY_DIR) message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_DIR}") - set (CMAKE_LIBRARY_PATH ${MSVC_3RDPARTY_DIR}/3rdParty/lib) - set (CMAKE_INCLUDE_PATH ${MSVC_3RDPARTY_DIR}/3rdParty/include) + set (CMAKE_LIBRARY_PATH ${MSVC_3RDPARTY_DIR}/3rdParty/lib ${MSVC_3RDPARTY_DIR}/install/msvc90/OpenScenegraph/lib ) + set (CMAKE_INCLUDE_PATH ${MSVC_3RDPARTY_DIR}/3rdParty/include ${MSVC_3RDPARTY_DIR}/install/msvc90/OpenScenegraph/include) set (BOOST_ROOT ${MSVC_3RDPARTY_DIR}/boost_1_44_0) set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_DIR}/3rdParty/include) + set (ALUT_INCLUDE_DIR ${MSVC_3RDPARTY_DIR}/3rdParty/include) set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_DIR}/3rdParty/lib) - set (OSGDIR ${MSVC_3RDPARTY_DIR}/install/msvc90/OpenScenegraph) endif (MSVC_3RDPARTY_DIR) find_package(Boost REQUIRED)