[CONFIGURE] Simplify version detection for modern Visual Studio

This commit is contained in:
Victor Perevertkin 2020-03-31 12:29:56 +03:00
parent 8aa58c19a6
commit d37799ea3e
No known key found for this signature in database
GPG key ID: C750B7222E9C7830

View file

@ -54,18 +54,8 @@ if defined ROS_ARCH (
cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11 cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11
cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12
cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14 cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14
cl 2>&1 | find "19.10." > NUL && set VS_VERSION=15 cl 2>&1 | findstr /R /c:"19\.1.\." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.11." > NUL && set VS_VERSION=15 cl 2>&1 | findstr /R /c:"19\.2.\." > NUL && set VS_VERSION=16
cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.14." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.15." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.16." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.20." > NUL && set VS_VERSION=16
cl 2>&1 | find "19.21." > NUL && set VS_VERSION=16
cl 2>&1 | find "19.22." > NUL && set VS_VERSION=16
cl 2>&1 | find "19.23." > NUL && set VS_VERSION=16
cl 2>&1 | find "19.24." > NUL && set VS_VERSION=16
if not defined VS_VERSION ( if not defined VS_VERSION (
echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed.
goto quit goto quit