Skip to content

Commit d9a63c5

Browse files
committed
Update packaging.cmake
(cherry picked from commit d87d8d1)
1 parent 4ef2c03 commit d9a63c5

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

cmake/packaging.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ if ( NOT ${CMAKE_BUILD_TYPE} STREQUAL Release )
3131
set (BT ${CMAKE_BUILD_TYPE})
3232
endif()
3333

34-
if ( MINGW OR MSYS )
34+
if ( MINGW )
3535
set (PACKDIR MinGW)
36+
elseif ( MSYS )
37+
set (PACKDIR MSYS)
3638
elseif ( MSVC )
3739
set (PACKDIR msvc)
3840
elseif ( CYGWIN )
@@ -66,8 +68,10 @@ endif()
6668

6769
set (VS "") # VisualStudio
6870
if ( MSVC )
69-
# VS2015 >= 1900, VS2017 >= 1910, VS2019 >= 1920
70-
if ( MSVC_VERSION GREATER 1919 )
71+
# VS2015 >= 1900, VS2017 >= 1910, VS2019 >= 1920, VS2022 >= 1930
72+
if ( MSVC_VERSION GREATER 1929 )
73+
set(VS 2022)
74+
elseif ( MSVC_VERSION GREATER 1919 )
7175
set(VS 2019)
7276
elseif ( MSVC_VERSION GREATER 1909 )
7377
set(VS 2017)

0 commit comments

Comments
 (0)