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

[Michał Górny via Openmp-commits]

mgorny created this revision.
mgorny added reviewers: Hahnfeld, jlpeyton.
mgorny added a subscriber: openmp-commits.
Herald added subscribers: mgorny, beanz.

Fix lit search to correctly respect LIBOMP_LLVM_LIT_EXECUTABLE as full program path.

The variable passed to find_program() is created by CMake as a cache variable, and therefore can be directly overriden by the user. Since this was the design of LIBOMP_LLVM_LIT_EXECUTABLE (as can be deduced from the error messages) and there is no other use of LIT_EXECUTABLE, remove the redundant variable and pass LIBOMP_LLVM_LIT_EXECUTABLE directly to find_program().

Furthermore, the previous code did not work since the HINTS argument specifies more search directories rather than expected full path. Quoting the CMake documentation:

> 3. Search the paths specified by the HINTS option. These should be paths computed by system introspection, such as a hint provided by the location of another item already found. Hard-coded guesses should be specified with the PATHS option.


https://reviews.llvm.org/D24710

Files:
  runtime/test/CMakeLists.txt

Index: runtime/test/CMakeLists.txt
===================================================================
--- runtime/test/CMakeLists.txt
+++ 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.71759.patch
Type: text/x-patch
Size: 1354 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20160918/b67c35de/attachment.bin>