[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - configure.ac

[Libreoffice Gerrit user]

 configure.ac |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 9ed436e44fbef0db50bd04440ee0a188ae89f390
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Fri Jun 29 11:20:57 2018 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Mon Nov 5 15:03:23 2018 +0100

    Only supported MSVS version on this branch is VS2015
    
    Due to 3rd party dependencies requiring better C++11 support
    
    Change-Id: Ic603ce6567e21f809eda042e981e4dc099b64f43
    (cherry picked from commit eaf14ee264dc266586831e234c81662693eb5ea6)

diff --git a/configure.ac b/configure.ac
index 169b9d76de1d..0621613f8531 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2063,13 +2063,6 @@ AC_ARG_WITH(doxygen,
          documentation. Not relevant in the --disable-odk case.]),
 ,with_doxygen=yes)
 
-AC_ARG_WITH(visual-studio,
-    AS_HELP_STRING([--with-visual-studio=<2013/2015>],
-        [Specify which Visual Studio version to use in case several are
-         installed. If not specified, only 2013 is detected automatically
-         because 2015 support is currently experimental.]),
-,)
-
 AC_ARG_WITH(windows-sdk,
     AS_HELP_STRING([--with-windows-sdk=<7.1(A)/8.0(A)/8.1(A)/10>],
         [Specify which Windows SDK, or "Windows Kit", version to use
@@ -3290,8 +3283,8 @@ vs_versions_to_check()
         map_vs_year_to_version "$1"
         vsversions=$vsversion
     else
-        # By default we prefer 2013/2015, in this order
-        vsversions="12.0 14.0"
+        # Only support VS2015 going forward
+        vsversions="14.0"
     fi
 }