[PATCH] D23745: [cmake] Update lit search to match the one in LLVM

[Michał Górny via cfe-commits]

mgorny retitled this revision from "cmake: Adjust llvm-lit search to match the one in LLVM" to "[cmake] Update lit search to match the one in LLVM".
mgorny updated the summary for this revision.
mgorny updated this revision to Diff 73192.
Herald added a subscriber: beanz.

https://reviews.llvm.org/D23745

Files:
  CMakeLists.txt


Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -124,6 +124,7 @@
     endif()
 
     if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
+      # Note: path not really used, except for checking if lit was found
       set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
       if(NOT LLVM_UTILS_PROVIDED)
         add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/FileCheck utils/FileCheck)
@@ -140,8 +141,10 @@
       endif()
     else()
       # Seek installed Lit.
-      find_program(LLVM_LIT "lit.py" ${LLVM_MAIN_SRC_DIR}/utils/lit
-        DOC "Path to lit.py")
+      find_program(LLVM_LIT
+                   NAMES llvm-lit lit.py lit
+                   PATHS "${LLVM_MAIN_SRC_DIR}/utils/lit"
+                   DOC "Path to lit.py")
     endif()
 
     if(LLVM_LIT)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23745.73192.patch
Type: text/x-patch
Size: 851 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20161001/165640aa/attachment.bin>