VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 09:18:54 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'f4exb:master' into map_3d

Browse Source
This commit is contained in:
srcejon 2022-02-05 20:42:22 +00:00 committed by GitHub
commit c3583aae5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -195,16 +195,18 @@ elseif(APPLE)
elseif (WIN32) elseif (WIN32)
# check compiler version # check compiler version
message(STATUS "MSVC_VERSION is ${MSVC_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) 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) 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) set(VS2015 ON)
endif() endif()
if(NOT VS2015 AND NOT VS2017 AND NOT VS2019) if(NOT VS2015 AND NOT VS2017 AND NOT VS2019 AND NOT VS2022)
message(FATAL_ERROR "You must use Microsoft Visual Studio 2015, 2017 or 2019 as compiler") message(FATAL_ERROR "You must use Microsoft Visual Studio 2015, 2017, 2019 or greater as compiler")
endif() endif()
# in alternative we can use ExternalProject # in alternative we can use ExternalProject