From 915aea7b1ab1464342fa214333b3f0c4b5b4c480 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 7 Jul 2013 09:42:57 +0000 Subject: [PATCH] [CMAKE] - Try again to fix version detection. If anyone sees compilers that are not .00 versions, please complain. This is required because a simply "contains" check can match all parts of the version number -- e.g. 16.00.40219.01 contains "19." in addition to "16." svn path=/trunk/; revision=59443 --- reactos/configure.cmd | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/reactos/configure.cmd b/reactos/configure.cmd index e78d932110e..bd1ce26cf68 100755 --- a/reactos/configure.cmd +++ b/reactos/configure.cmd @@ -57,10 +57,11 @@ if defined ROS_ARCH ( cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8 - cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9 - cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 - cl 2>&1 | find "17." > NUL && set BUILD_ENVIRONMENT=VS11 + cl 2>&1 | find "14.00." > NUL && set BUILD_ENVIRONMENT=VS8 + cl 2>&1 | find "15.00." > NUL && set BUILD_ENVIRONMENT=VS9 + cl 2>&1 | find "16.00." > NUL && set BUILD_ENVIRONMENT=VS10 + cl 2>&1 | find "17.00." > NUL && set BUILD_ENVIRONMENT=VS11 + ::cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12 if not defined BUILD_ENVIRONMENT ( echo Error: Visual Studio version too old or version detection failed. exit /b