X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=b2187a495af657587cd2493ace78cb8eca1e331b;hb=0e92cfbd0d2ede2c2535260e5a25a2652484f1ff;hp=8b3e653616769635b377117f5a7430af30491ebd;hpb=76c3f7bc8fc705118b728ce07eff72292e35137a;p=simgear.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b3e6536..b2187a49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ include (CPack) project(SimGear) -set(SIMGEAR_VERSION "2.2.0") +set(SIMGEAR_VERSION "2.3.0") #packaging SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") @@ -20,7 +20,7 @@ option(SIMGEAR_HEADLESS "Set to ON to build SimGear with GUI/graphics support" O option(JPEG_FACTORY "Enable JPEG-factory support" OFF) set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted") -if (MSVC_3RDPARTY_ROOT) +if (MSVC AND MSVC_3RDPARTY_ROOT) message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_ROOT}") set( OSG_MSVC "msvc" ) if (${MSVC_VERSION} EQUAL 1600) @@ -41,7 +41,7 @@ if (MSVC_3RDPARTY_ROOT) set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include) set (ALUT_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include) set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib) -endif (MSVC_3RDPARTY_ROOT) +endif (MSVC AND MSVC_3RDPARTY_ROOT) find_package(Boost REQUIRED) set (BOOST_CXX_FLAGS "-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_BIMAP_DISABLE_SERIALIZATION")