Merge remote-tracking branch 'origin/GT-3248_ryanmkurtz_PR-1033_kant2002_vs-error-msg'

This commit is contained in:
Ryan Kurtz 2019-10-18 11:32:01 -04:00
commit 062498af0d

View File

@ -51,7 +51,7 @@ task CheckToolChain {
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
// ensure that required MS Visual Studio is installed where expected // ensure that required MS Visual Studio is installed where expected
String msg = "Microsoft Visual Studio install not found: ${VISUAL_STUDIO_BASE_DIR}\n" + String msg = "Microsoft Visual Studio install not found: ${VISUAL_STUDIO_BASE_DIR}\n" +
"Adjust path in Ghidra/GPL/nativeBuildProperties.gradle if needed." "Adjust path in Ghidra/GPL/vsconfig.gradle if needed."
if (!file(VISUAL_STUDIO_BASE_DIR).exists() || !file(VISUAL_STUDIO_INSTALL_DIR).exists()) { if (!file(VISUAL_STUDIO_BASE_DIR).exists() || !file(VISUAL_STUDIO_INSTALL_DIR).exists()) {
throw new GradleException(msg); throw new GradleException(msg);
} }