From e849dfb9fa467f0c3e5a3352ec35ba212b9df22f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 22 Oct 2018 14:58:23 -0400
Subject: [PATCH] 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.
---
autobuild.xml | 2 +-
build.sh | 2 +-
indra/cmake/Copy3rdPartyLibs.cmake | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index cbd74130345..bd92cee6a36 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3769,7 +3769,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>windows</key>
<map>
<key>build_directory</key>
- <string>build-vc120-$AUTOBUILD_ADDRSIZE</string>
+ <string>build-vc${AUTOBUILD_VSVER|120}-$AUTOBUILD_ADDRSIZE</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>
diff --git a/build.sh b/build.sh
index e35028ad6e1..545c913f92c 100755
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,7 @@ build_dir_Linux()
build_dir_CYGWIN()
{
- echo build-vc120-${AUTOBUILD_ADDRSIZE}
+ echo build-vc${AUTOBUILD_VSVER:-120}-${AUTOBUILD_ADDRSIZE}
}
viewer_channel_suffix()
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index c73a1fdb47b..a8b353ff336 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)
--
GitLab