diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-28 14:24:18 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-28 14:24:18 -0700 |
| commit | 4b57b70b6d73d2d9560f379794500a95dcd2f620 (patch) | |
| tree | 71f00e216b0b1e0576793ac9ad94e0a170dcc8a0 /indra | |
| parent | 33bb511ab4acd5867fbe5f11393a01e438b72293 (diff) | |
| parent | 83e80d79672210355d0291e30bd89bd03c672ca6 (diff) | |
Merge remote-tracking branch 'origin/main' into release/materials_featurette
Diffstat (limited to 'indra')
| -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") |