diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-07-21 23:07:44 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-07-22 17:49:56 +0000 |
commit | cdd699eacf853192686095399433384109e565a2 (patch) | |
tree | 79cc5edecde03a13caedf28fb0782500f57f26d3 | |
parent | 420be486f04d99b08311151a4230699099184baa (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e7f68723f25e..2d36f0c388c7 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 |