diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-08-30 15:20:04 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-08-30 15:20:04 -0700 |
| commit | ef58b9751a514e5e63cd77f9f78e6513bc6403cd (patch) | |
| tree | 1465b785f7352b448959e9eb81c34c02d4f9abdf /indra | |
| parent | a3f7f7d8c08e19d338911e107707f756469716bc (diff) | |
DRTVWR-568: Pull in new 3p-colladadom build, tweak to VSVER number hardcoded into autobuild.xml for VS 2022 and update cmake script to copy the MSVC runtime (proper fix coming
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index c2e1bb4b85..fbec709f0c 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -105,6 +105,8 @@ 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 + set(MSVC_VER 140) else (MSVC80) MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake") endif (MSVC80) |