summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2016-02-17 19:49:12 +0100
committerMichael Stahl <mstahl@redhat.com>2016-02-18 19:23:07 +0000
commitadc69d7fe391154fcebf9c97b857c6ddccec4539 (patch)
treee5b41cf360475417161cc7209d34cc9e9e03b06f /configure.ac
parentb9ef5a4b129bf5c7ce566ba1da74a2e21595b8fa (diff)
Consider MSVC 14.0 per default, when no MSVC 12.0 installed
Change-Id: I7de8df7d8b7da2c16e27f22529162574bc0f747d Reviewed-on: https://gerrit.libreoffice.org/22436 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org> (cherry picked from commit 649f74e21b6dc7117b542f490272897ac1d00566) Signed-off-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/22484
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index fc1f17961780..5099873cb7a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3343,8 +3343,8 @@ vs_versions_to_check()
map_vs_year_to_version "$1"
vsversions=$vsversion
else
- # By default we prefer 2013
- vsversions=12.0
+ # By default we prefer 2013/2015, in this order
+ vsversions="12.0 14.0"
fi
}