[PATCH] D73858: Fix CMake config breakage in COMPILE_LANGUAGE generator

[Evan Wilde via Phabricator via llvm-commits]

etcwilde created this revision.
etcwilde added reviewers: compnerd, chandlerc, beanz, mstorsjo.
Herald added subscribers: llvm-commits, mgorny.
Herald added a project: LLVM.

Listing multiple languages in the COMPILE_LANGUAGE generator is legal in CMake 3.15 and above, but not legal in earlier CMake versions.
Replacing that with an OR should behave the same way and be legal for older versions of CMake.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D73858

Files:
  llvm/cmake/modules/HandleLLVMOptions.cmake


Index: llvm/cmake/modules/HandleLLVMOptions.cmake
===================================================================
--- llvm/cmake/modules/HandleLLVMOptions.cmake
+++ llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -59,7 +59,7 @@
   if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
     # NOTE: use `add_compile_options` rather than `add_definitions` since
     # `add_definitions` does not support generator expressions.
-    add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-UNDEBUG>)
+    add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-UNDEBUG>)
 
     # Also remove /D NDEBUG to avoid MSVC warnings about conflicting defines.
     foreach (flags_var_to_scrub


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D73858.241950.patch
Type: text/x-patch
Size: 695 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200202/8998fa24/attachment.bin>