Commit 42453a21 authored by Jørgen Lind's avatar Jørgen Lind
Browse files

Merge branch feature/jorgen.lind/vs2015_disable_azure_sdk_for with...

Merge branch feature/jorgen.lind/vs2015_disable_azure_sdk_for with refs/heads/master into refs/merge-requests/422/train
parents 08613351 a59862ed
Pipeline #45934 passed with stages
in 27 minutes and 51 seconds
......@@ -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}$<$<NOT:$<CONFIG:Release>>:/$<CONFIG>>")
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment