From e849dfb9fa467f0c3e5a3352ec35ba212b9df22f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 22 Oct 2018 14:58:23 -0400 Subject: DRTVWR-476: Update Copy3rdPartyLibs.cmake for VS 2017 version. Also, on Windows, put build output into build-vc$AUTOBUILD_VSVER-$AUTOBUILD_ADDRSIZE instead of hard-coding build-vc120-$AUTOBUILD_ADDRSIZE. --- indra/cmake/Copy3rdPartyLibs.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index c73a1fdb47..a8b353ff33 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -73,7 +73,6 @@ if(WINDOWS) #******************************* # Copy MS C runtime dlls, required for packaging. - # *TODO - Adapt this to support VC9 if (MSVC80) list(APPEND LMSVC_VER 80) list(APPEND LMSVC_VERDOT 8.0) @@ -82,6 +81,9 @@ if(WINDOWS) elseif (MSVC_VERSION EQUAL 1800) # VisualStudio 2013, which is (sigh) VS 12 list(APPEND LMSVC_VER 120) list(APPEND LMSVC_VERDOT 12.0) + elseif (MSVC_VERSION EQUAL 1915) # Visual Studio 2017 + list(APPEND LMSVC_VER 150) + list(APPEND LMSVC_VERDOT 15.0) else (MSVC80) MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake") endif (MSVC80) -- cgit v1.2.3