aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabrĂ­el ArthĂșr PĂ©tursson <gabriel@system.is>2017-12-30 12:38:53 +0000
committerNirbheek Chauhan <nirbheek@centricular.com>2018-02-19 01:32:17 +0530
commitd5d769cd9d6f41b078c561e2093ddae5fa0a0052 (patch)
treee16709566772b95483b3567423f135dd981353fd
parent6a845dee359d841eee08759439b134261ddd02dd (diff)
downloadmeson-d5d769cd9d6f41b078c561e2093ddae5fa0a0052.zip
meson-d5d769cd9d6f41b078c561e2093ddae5fa0a0052.tar.gz
meson-d5d769cd9d6f41b078c561e2093ddae5fa0a0052.tar.bz2
Fail Visual Studio version detection if VSINSTALLDIR is not set
The Visual Studio Developer Command Prompt always sets the VSINSTALLDIR environment variable. If not, we probably have a broken environment and won't get very far anyway.
-rw-r--r--mesonbuild/backend/vs2010backend.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 5678e54..367f391 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -29,10 +29,9 @@ from ..environment import Environment
def autodetect_vs_version(build):
vs_version = os.getenv('VisualStudioVersion', None)
vs_install_dir = os.getenv('VSINSTALLDIR', None)
- if not vs_version and not vs_install_dir:
- raise MesonException('Could not detect Visual Studio: VisualStudioVersion and VSINSTALLDIR are unset!\n'
- 'Are we inside a Visual Studio build environment? '
- 'You can also try specifying the exact backend to use.')
+ if not vs_install_dir:
+ raise MesonException('Could not detect Visual Studio: Environment variable VSINSTALLDIR is not set!\n'
+ 'Are you running meson from the Visual Studio Developer Command Prompt?')
# VisualStudioVersion is set since Visual Studio 12.0, but sometimes
# vcvarsall.bat doesn't set it, so also use VSINSTALLDIR
if vs_version == '14.0' or 'Visual Studio 14' in vs_install_dir: