[PATCH] D109521: Remove obsolete msvc workaround from AddLLVM.cmake

[Stella Stamenova via Phabricator via llvm-commits]

stella.stamenova created this revision.
stella.stamenova added a reviewer: mehdi_amini.
Herald added subscribers: Chia-hungDuan, rriddle, mgorny.
stella.stamenova requested review of this revision.
Herald added subscribers: llvm-commits, stephenneuendorffer.
Herald added a project: LLVM.

The original change to add the workaround is from 10 years ago and a lot has happened with msvc and cmake and llvm's usage of cmake since and we no longer need the workaround for any scenarios that I am aware of. Build more is now correctly configured for multi-configuration generators such as Visual Studio.

The workaround is, however, causing issues with some of the recent mlir tests as because of the workaround we cannot correctly determine whether assertions are enabled (see https://reviews.llvm.org/D105961).

The original change is:

  commit b46fdac4609df2613177813d43a124e3d9a8a306
  Author: Andrew Trick <atrick at apple.com>
  Date:   Tue Jun 28 16:32:01 2011
  
      cmake: Our MSVC build does not support config-time build mode.
      
      llvm-svn: 134008


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D109521

Files:
  llvm/cmake/modules/AddLLVM.cmake


Index: llvm/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm/cmake/modules/AddLLVM.cmake
+++ llvm/cmake/modules/AddLLVM.cmake
@@ -1638,7 +1638,7 @@
     set(ENABLE_SHARED "0")
   endif()
 
-  if(LLVM_ENABLE_ASSERTIONS AND NOT MSVC_IDE)
+  if(LLVM_ENABLE_ASSERTIONS)
     set(ENABLE_ASSERTIONS "1")
   else()
     set(ENABLE_ASSERTIONS "0")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D109521.371623.patch
Type: text/x-patch
Size: 396 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210909/c1479937/attachment.bin>