[PATCH] D73751: [CMake] Fix MSVC buggy version check

[Christopher Tetreault via Phabricator via llvm-commits]

ctetreau created this revision.
Herald added subscribers: llvm-commits, mgorny.
Herald added a project: LLVM.
ctetreau added reviewers: mehdi_amini, efriedma, apazos.

- Add parens and ${} to cmake check to work around CMake configure time "unknown arguments specified" issue


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D73751

Files:
  llvm/cmake/modules/CheckCompilerVersion.cmake


Index: llvm/cmake/modules/CheckCompilerVersion.cmake
===================================================================
--- llvm/cmake/modules/CheckCompilerVersion.cmake
+++ llvm/cmake/modules/CheckCompilerVersion.cmake
@@ -53,9 +53,9 @@
 # See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html
 # and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly"
 # on llvm-dev Jan 21-23 2020.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND
-    19.24 VERSION_LESS_EQUAL CMAKE_CXX_COMPILER_VERSION AND
-    CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.25)
+if ((${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) AND
+    (19.24 VERSION_LESS_EQUAL ${CMAKE_CXX_COMPILER_VERSION}) AND
+    (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 19.25))
   if(LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN)
     message(WARNING "Host Visual Studio version 16.4 is known to miscompile part of LLVM")
   else()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D73751.241604.patch
Type: text/x-patch
Size: 959 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200130/142b410f/attachment.bin>