Merge branch 'f4exb:master' into map_3d

pull/1127/head
srcejon 2022-02-05 20:42:22 +00:00 zatwierdzone przez GitHub
commit c3583aae5b
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 7 dodań i 5 usunięć

Wyświetl plik

@ -195,16 +195,18 @@ elseif(APPLE)
elseif (WIN32)
# check compiler version
message(STATUS "MSVC_VERSION is ${MSVC_VERSION}")
if(MSVC_VERSION GREATER 1920 AND MSVC_VERSION LESS 1930)
if(MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1940)
set(VS2022 ON)
elseif(MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1930)
set(VS2019 ON)
elseif(MSVC_VERSION GREATER 1910 AND MSVC_VERSION LESS 1919)
elseif(MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1919)
set(VS2017 ON)
elseif(MSVC_VERSION GREATER 1899 AND MSVC_VERSION LESS 1910)
elseif(MSVC_VERSION GREATER_EQUAL 1900 AND MSVC_VERSION LESS 1910)
set(VS2015 ON)
endif()
if(NOT VS2015 AND NOT VS2017 AND NOT VS2019)
message(FATAL_ERROR "You must use Microsoft Visual Studio 2015, 2017 or 2019 as compiler")
if(NOT VS2015 AND NOT VS2017 AND NOT VS2019 AND NOT VS2022)
message(FATAL_ERROR "You must use Microsoft Visual Studio 2015, 2017, 2019 or greater as compiler")
endif()
# in alternative we can use ExternalProject