[llvm] r290914 - Fix the MSVC version check.

Zachary Turner via llvm-commits llvm-commits at lists.llvm.org
Tue Jan 3 15:12:37 PST 2017


Author: zturner
Date: Tue Jan  3 17:12:36 2017
New Revision: 290914

URL: http://llvm.org/viewvc/llvm-project?rev=290914&view=rev
Log:
Fix the MSVC version check.

I'm not sure what determines the minor version, but it appears
that it's possible for a fully updated, release version of
VS2015 with Update 3 can go (at least) as low as 19.00.24213.1.
Updating the compiler version check to account for this so we
don't generate superfluous warnings.

Modified:
    llvm/trunk/cmake/modules/CheckCompilerVersion.cmake

Modified: llvm/trunk/cmake/modules/CheckCompilerVersion.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/CheckCompilerVersion.cmake?rev=290914&r1=290913&r2=290914&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/CheckCompilerVersion.cmake (original)
+++ llvm/trunk/cmake/modules/CheckCompilerVersion.cmake Tue Jan  3 17:12:36 2017
@@ -43,8 +43,8 @@ int main() { return (float)x; }"
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
       if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0)
         message(FATAL_ERROR "Host Visual Studio must be at least 2015")
-      elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.00.24215.1)
-        message(WARNING "Host Visual Studio should at least be 2015 Update 3 (MSVC 19.00.24215.1)"
+      elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.00.24213.1)
+        message(WARNING "Host Visual Studio should at least be 2015 Update 3 (MSVC 19.00.24213.1)"
           "  due to miscompiles from earlier versions")
       endif()
     endif()




More information about the llvm-commits mailing list