Skip to content

Commit 9fd7bf2

Browse files
committed
cmake: add support for Visual Studio 2019
1 parent 7d3c1d1 commit 9fd7bf2

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Diff for: CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ elseif(APPLE)
157157
message(STATUS "RPATH support: ${CMAKE_MACOSX_RPATH}")
158158

159159
elseif (WIN32)
160-
if(NOT VS2015 AND NOT VS2017)
161-
message(FATAL_ERROR "You must use Microsoft Visual Studio 2015 or 2017 as compiler")
160+
if(NOT VS2015 AND NOT VS2017 AND NOT VS2019)
161+
message(FATAL_ERROR "You must use Microsoft Visual Studio 2015, 2017 or 2019 as compiler")
162162
endif()
163163

164164
# compile with full multicore

Diff for: cmake/modules/FindCompiler.cmake

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ elseif(NOT DEFINED C_GCC AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
55
set(C_GCC 1)
66
elseif(NOT DEFINED C_MSVC AND CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
77
set(C_MSVC 1)
8-
if(MSVC_VERSION GREATER 1910 AND MSVC_VERSION LESS 1919)
8+
if(MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS_EQUAL 1929)
9+
set(VS2019 ON)
10+
elseif(MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS_EQUAL 1919)
911
set(VS2017 ON)
1012
elseif(MSVC_VERSION GREATER 1899 AND MSVC_VERSION LESS 1910)
1113
set(VS2015 ON)

0 commit comments

Comments
 (0)