[Openmp-commits] [PATCH] D24710: [openmp] [cmake] Fix respecting LIBOMP_LLVM_LIT_EXECUTABLE as full path

[Michał Górny via Openmp-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL281887: Fix respecting LIBOMP_LLVM_LIT_EXECUTABLE as full path (authored by mgorny).

Changed prior to commit:
  https://reviews.llvm.org/D24710?vs=71759&id=71771#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D24710

Files:
  openmp/trunk/runtime/test/CMakeLists.txt

Index: openmp/trunk/runtime/test/CMakeLists.txt
===================================================================
--- openmp/trunk/runtime/test/CMakeLists.txt
+++ openmp/trunk/runtime/test/CMakeLists.txt
@@ -40,13 +40,10 @@
     "Compiler to use for testing OpenMP library")
   set(LIBOMP_TEST_OPENMP_FLAG -fopenmp CACHE STRING
     "OpenMP compiler flag to use for testing OpenMP library")
-  set(LIBOMP_LLVM_LIT_EXECUTABLE "" CACHE STRING
-    "Path to llvm-lit")
-  find_program(LIT_EXECUTABLE
+  find_program(LIBOMP_LLVM_LIT_EXECUTABLE
     NAMES llvm-lit lit.py
-    HINTS ${LIBOMP_LLVM_LIT_EXECUTABLE}
     PATHS ${OPENMP_LLVM_TOOLS_DIR})
-  if(NOT LIT_EXECUTABLE)
+  if(NOT LIBOMP_LLVM_LIT_EXECUTABLE)
     libomp_say("Cannot find llvm-lit.")
     libomp_say("Please put llvm-lit in your PATH, set LIBOMP_LLVM_LIT_EXECUTABLE to its full path or point OPENMP_LLVM_TOOLS_DIR to its directory")
     libomp_warning_say("The check-libomp target will not be available!")
@@ -71,7 +68,7 @@
     "Default options for lit")
   separate_arguments(LIBOMP_LIT_ARGS)
   add_custom_target(check-libomp
-    COMMAND ${PYTHON_EXECUTABLE} ${LIT_EXECUTABLE} ${LIBOMP_LIT_ARGS} ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${PYTHON_EXECUTABLE} ${LIBOMP_LLVM_LIT_EXECUTABLE} ${LIBOMP_LIT_ARGS} ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS omp
     COMMENT "Running libomp tests"
     ${cmake_3_2_USES_TERMINAL}


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D24710.71771.patch
Type: text/x-patch
Size: 1393 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20160919/6d767a20/attachment.bin>