configure.ac | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit cdd699eacf853192686095399433384109e565a2
Author: Michael Stahl <[email protected]>
Date: Tue Jul 21 23:07:44 2015 +0200
configure: try not to break with MSVC 2013 Express
The devenv.exe /Upgrade is apparently not supported by Express, but that
is currently only needed for the 2015 version, so try to keep 2013
Express working.
Change-Id: I40bb8a5c9583381e89ede2e014e6e095016bbe11
Reviewed-on: https://gerrit.libreoffice.org/17275
Tested-by: Jenkins <[email protected]>
Reviewed-by: Vasily Melenchuk <[email protected]>
Reviewed-by: Thorsten Behrens <[email protected]>
diff --git a/configure.ac b/configure.ac
index e7f6872..2d36f0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3568,6 +3568,10 @@ if test "$_os" = "WINNT"; then
# Find the version of devenv.exe
DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
+ if test ! -e "$DEVENV" -a "$vcnum" = "120"; then
+ # for Visual Studio 2013 Express, fall back
+ DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/WDExpress.exe"
+ fi
if test ! -e "$DEVENV"; then
AC_MSG_ERROR([No devenv.exe found, Visual Studio installation
broken?])
fi
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
