aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-06-09 20:25:27 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2017-06-09 20:25:27 +0530
commitb6b3905325884c5fd2a502d09680b5a35564f0df (patch)
tree76a2914708cfe30657760d26ceaf44e3f4d1218a
parent130076642974e62bdda3a6bf97317323cc8331f7 (diff)
downloadmeson-b6b3905325884c5fd2a502d09680b5a35564f0df.zip
meson-b6b3905325884c5fd2a502d09680b5a35564f0df.tar.gz
meson-b6b3905325884c5fd2a502d09680b5a35564f0df.tar.bz2
vs: Sometimes WindowsSDKVersion is unset
https://ci.appveyor.com/project/jpakkane/meson/build/2871/job/ti4qpoptd5tk19sn
-rw-r--r--mesonbuild/backend/vs2017backend.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/backend/vs2017backend.py b/mesonbuild/backend/vs2017backend.py
index 35d56f3..fe1d7c7 100644
--- a/mesonbuild/backend/vs2017backend.py
+++ b/mesonbuild/backend/vs2017backend.py
@@ -24,4 +24,6 @@ class Vs2017Backend(Vs2010Backend):
self.platform_toolset = 'v141'
self.vs_version = '2017'
# WindowsSDKVersion should be set by command prompt.
- self.windows_target_platform_version = os.getenv('WindowsSDKVersion', None).rstrip('\\')
+ sdk_version = os.environ.get('WindowsSDKVersion', None)
+ if sdk_version:
+ self.windows_target_platform_version = sdk_version.rstrip('\\')