[llvm] r290832 - [cmake] Normalize LLVM_ENABLE_DIA_SDK to fix Windows tests

Michal Gorny via llvm-commits llvm-commits at lists.llvm.org
Mon Jan 2 12:22:45 PST 2017


Author: mgorny
Date: Mon Jan  2 14:22:45 2017
New Revision: 290832

URL: http://llvm.org/viewvc/llvm-project?rev=290832&view=rev
Log:
[cmake] Normalize LLVM_ENABLE_DIA_SDK to fix Windows tests

Attempts to fix Windows build breakage caused by r290818.

Modified:
    llvm/trunk/cmake/config-ix.cmake

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=290832&r1=290831&r2=290832&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Mon Jan  2 14:22:45 2017
@@ -457,6 +457,13 @@ if( MSVC )
   if(LLVM_ENABLE_DIA_SDK AND NOT HAVE_DIA_SDK)
     message(FATAL_ERROR "DIA SDK not found. If you have both VS 2012 and 2013 installed, you may need to uninstall the former and re-install the latter afterwards.")
   endif()
+
+  # Normalize to 0/1 for lit.site.cfg
+  if(LLVM_ENABLE_DIA_SDK)
+    set(LLVM_ENABLE_DIA_SDK 1)
+  else()
+    set(LLVM_ENABLE_DIA_SDK 0)
+  endif()
 else()
   set(LLVM_ENABLE_DIA_SDK 0)
 endif( MSVC )




More information about the llvm-commits mailing list