diff options
author | Roxanne Skelly <roxie@lindenlab.com> | 2024-06-06 10:24:55 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-06 10:24:55 -0700 |
commit | 6a00609b0cede78f998971687a756b7fcf826c0f (patch) | |
tree | ff12ce8ec6c90ba89c293cda70b887e89cff570e /indra/cmake | |
parent | a1d7d2abc304b59fbca26f0ca23c926762be10a1 (diff) | |
parent | fb6c9dab3266c4df9392dc6e9361955bed0e90d2 (diff) |
Merge pull request #1660 from secondlife/roxie/webrtc-voice
Merge from main into release/webrtc-voice
Diffstat (limited to 'indra/cmake')
-rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 7938d4f54b..27b20ee3b1 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -107,7 +107,7 @@ if(WINDOWS) set(MSVC_VER 140) elseif (MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1930) # Visual Studio 2019 set(MSVC_VER 140) - elseif (MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1940) # Visual Studio 2022 + elseif (MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1950) # Visual Studio 2022 set(MSVC_VER 140) else (MSVC80) MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake") |