[Libreoffice-commits] core.git: configure.ac

[David Ostrovsky]

 configure.ac |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 05ed013cbc5f3b9a112e7080a52a69f456d7e506
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Fri Jun 27 17:52:12 2014 +0200

    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 at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/configure.ac b/configure.ac
index 38c2ea9..dcf3b69 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