From a59862edd1e93522dfd1c3b1c248caf875d99fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Fri, 11 Jun 2021 14:50:11 +0200 Subject: [PATCH] Disable AzureSDKForCPP on Visual Studio 2015 and before --- CMakeLists.txt | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86d92dce..5c6a965f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,19 @@ project(OpenVDS VERSION ${OpenVDSVersion}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake") + +if(WIN32) + if(CMAKE_VS_PLATFORM_TOOLSET) + string(REGEX REPLACE "^v" "" MSVC_TOOLSET_VERSION_LOCAL "${CMAKE_VS_PLATFORM_TOOLSET}") + else() + set(MSVC_TOOLSET_VERSION_LOCAL ${MSVC_TOOLSET_VERSION}) + endif() +endif() + +if (${MSVC_TOOLSET_VERSION_LOCAL}) + set(LIB_TOOLSET_DIR "/msvc_${MSVC_TOOLSET_VERSION_LOCAL}") +endif() + include(GNUInstallDirs) set (TEST_DATA_PATH "" CACHE PATH "Test data path") @@ -75,7 +88,11 @@ if (WIN32) set(DEFAULT_BUILD_UV ON) set(DEFAULT_USE_LIBRESSL ON) set(DEFAULT_BUILD_LIBXML ON) - set(DEFAULT_DISABLE_AZURESDKFORCPP OFF) + if (MSVC_TOOLSET_VERSION_LOCAL LESS_EQUAL "140") + set(DEFAULT_DISABLE_AZURESDKFORCPP ON) + else() + set(DEFAULT_DISABLE_AZURESDKFORCPP OFF) + endif() else() set(DEFAULT_BUILD_ZLIB OFF) set(DEFAULT_BUILD_CURL OFF) @@ -139,18 +156,6 @@ define_property(GLOBAL PROPERTY OPENVDS_LINK_LIBRARIES_DEBUG BRIEF_DOCS "OpenV define_property(GLOBAL PROPERTY OPENVDS_INCLUDE_LIBRARIES BRIEF_DOCS "OpenVDS include libraries" FULL_DOCS "Include paths for 3rdparty") define_property(GLOBAL PROPERTY OPENVDS_DEPENDENCY_TARGETS BRIEF_DOCS "Dependency targets for OpenVDS" FULL_DOCS "Targets that OpenVDS needs to build first") -if(WIN32) - if(CMAKE_VS_PLATFORM_TOOLSET) - string(REGEX REPLACE "^v" "" MSVC_TOOLSET_VERSION_LOCAL "${CMAKE_VS_PLATFORM_TOOLSET}") - else() - set(MSVC_TOOLSET_VERSION_LOCAL ${MSVC_TOOLSET_VERSION}) - endif() -endif() - -if (${MSVC_TOOLSET_VERSION_LOCAL}) - set(LIB_TOOLSET_DIR "/msvc_${MSVC_TOOLSET_VERSION_LOCAL}") -endif() - set(LIB_TOOLSET_DIR "${LIB_TOOLSET_DIR}$<$>:/$>") set_property(GLOBAL PROPERTY USE_FOLDERS ON) -- GitLab