From abb3ef00ce4e70d0a57dbb61430c82ee7b84df49 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Thu, 4 Jul 2019 16:13:46 +0200
Subject: [PATCH] [conan] Updated the visual studio versions in conan.cmake up
to 2019
---
scripts/cmake/conan/conan.cmake | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/cmake/conan/conan.cmake b/scripts/cmake/conan/conan.cmake
index 2575b9dd42d..fab4601bee6 100644
--- a/scripts/cmake/conan/conan.cmake
+++ b/scripts/cmake/conan/conan.cmake
@@ -52,6 +52,8 @@ function(_get_msvc_ide_version result)
set(${result} 14 PARENT_SCOPE)
elseif(NOT MSVC_VERSION VERSION_LESS 1910 AND MSVC_VERSION VERSION_LESS 1920)
set(${result} 15 PARENT_SCOPE)
+ elseif(NOT MSVC_VERSION VERSION_LESS 1920 AND MSVC_VERSION VERSION_LESS 1930)
+ set(${result} 16 PARENT_SCOPE)
else()
message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")
endif()
--
GitLab