diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2014-06-27 17:52:12 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-09 09:34:57 +0000 |
| commit | 05ed013cbc5f3b9a112e7080a52a69f456d7e506 (patch) | |
| tree | ead07a431aa730db3b4dcb3f3693185805bfb454 | |
| parent | b6da6a887a0417be02e123a6d19837123e58b94f (diff) | |
VS2013: Prefer it over VS2012 and VS2010
The preference for compiler picking on Windows is:
1. vs2012
2. vs2010
3. vs2013
Because vs2013 was considered as unsupported compiler the only
option to acivate is to provide additional option to the autogen:
--with-visual-studio=2013
Now, that vs2013 is up and running change the preference order and
pick the newest installed compiler.
Change-Id: I76412b9a1bd9514904bbcca99230896add0424f1
Reviewed-on: https://gerrit.libreoffice.org/10154
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 38c2ea97b6f9..dcf3b69fa71f 100644 --- a/configure.ac +++ b/configure.ac @@ -2002,12 +2002,12 @@ AC_ARG_WITH( [with_doxygen=yes]) AC_ARG_WITH(visual-studio, - AS_HELP_STRING([--with-visual-studio=<2012/2010/2013>], + AS_HELP_STRING([--with-visual-studio=<2013/2012/2010>], [Specify which Visual Studio version to use in case several are are installed. If not specified, the order of preference is - 2012, 2010, 2013 (including Express editions).]) + 2013, 2012, 2010 (including Express editions).]) [ - Usage: --with-visual-studio=<2012/2010/2013> + Usage: --with-visual-studio=<2013/2012/2010> ], ,) @@ -3610,14 +3610,14 @@ vs_versions_to_check() map_vs_year_to_version "$1" vsversions=$vsversion else - # By default we prefer 2012, then 2010, then 2013 - vsversions="11.0 10.0 12.0" + # By default we prefer 2013, 2012, then 2010 + vsversions="12.0 11.0 10.0" fi } find_msvs() { - # Find Visual Studio 2012/2010/2013 + # Find Visual Studio 2013/2012/2010 # Args: $1 (optional) : versions to check, in the order of preference # Return value: $vstest @@ -3641,7 +3641,7 @@ find_msvs() find_msvc() { - # Find Visual C++ 2012/2010/2013 + # Find Visual C++ 2013/2012/2010 # Args: $1 (optional) : The VS version year # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot |