[CMake] Introduce OPENMP_LLVM_TOOLS_DIR

[Hahnfeld]

Summary

This will be used in a later patch to find additional LLVM tools for tests and enables reusability for libomptarget that is currently under review.

(or can LIBOMP_LLVM_LIT_EXECUTABLE be completely replaced by LIBOMP_LLVM_TOOLS_DIR?)

[jlpeyton]

LGTM.

[jlpeyton]

(or can LIBOMP_LLVM_LIT_EXECUTABLE be completely replaced by LIBOMP_LLVM_TOOLS_DIR?)

For now, lets just leave it.

[Hahnfeld]

Rename LIBOMP_LLVM_TOOLS_DIR to OPENMP_LLVM_TOOLS_DIR to later reuse it for libomptarget

[jlpeyton]

In D16713#341416, @Hahnfeld wrote:

Rename LIBOMP_LLVM_TOOLS_DIR to OPENMP_LLVM_TOOLS_DIR to later reuse it for libomptarget

Where is libomptarget going to be placed?

[Hahnfeld]

In D16713#341701, @jlpeyton wrote:

In D16713#341416, @Hahnfeld wrote:

Rename LIBOMP_LLVM_TOOLS_DIR to OPENMP_LLVM_TOOLS_DIR to later reuse it for libomptarget

Where is libomptarget going to be placed?

See D14031

[jlpeyton]

Ok. I understand now. You can go ahead and apply this patch.

openmp/trunk/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+
+set(OPENMP_LLVM_TOOLS_DIR "" CACHE PATH "Path to LLVM tools for testing")
+
 add_subdirectory(runtime)

openmp/trunk/runtime/Build_With_CMake.txt

 
 -DLIBOMP_HWLOC_INSTALL_DIR=/path/to/hwloc/install/dir
 Default: /usr/local
 This option is only used if LIBOMP_USE_HWLOC is on.
 Specifies install location of Hwloc. The configuration system will look for
 hwloc.h in ${LIBOMP_HWLOC_INSTALL_DIR}/include and the library in 
 ${LIBOMP_HWLOC_INSTALL_DIR}/lib.
 
+-DLIBOMP_LLVM_LIT_EXECUTABLE=/path/to/llvm-lit
+Default: search in PATH
+Specifiy full path to llvm-lit executable for running tests.
+
+-DOPENMP_LLVM_TOOLS_DIR=/path/to/built/llvm/tools
+Default: search for tools in path
+Additional path to search for LLVM tools needed by tests.
+
 ================================
 How to append flags to the build
 ================================
 - These flags are *appended*.  They do not 
   overwrite any of the preset flags.
 -DLIBOMP_CPPFLAGS=<space-separated flags> -- Additional C preprocessor flags
 -DLIBOMP_CFLAGS=<space-separated flags>   -- Additional C compiler flags
 -DLIBOMP_CXXFLAGS=<space-separated flags> -- Additional C++ compiler flags

openmp/trunk/runtime/test/CMakeLists.txt

else()
     set(cmake_3_2_USES_TERMINAL USES_TERMINAL)
   endif()
   set(LIBOMP_TEST_COMPILER ${CMAKE_C_COMPILER} CACHE STRING
     "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 NAMES llvm-lit ${LIBOMP_LLVM_LIT_EXECUTABLE})
+  find_program(LIT_EXECUTABLE
+    NAMES llvm-lit
+    HINTS ${LIBOMP_LLVM_LIT_EXECUTABLE}
+    PATHS ${OPENMP_LLVM_TOOLS_DIR})
   if(NOT LIT_EXECUTABLE)
     libomp_say("Cannot find llvm-lit.")
-    libomp_say("Please put llvm-lit in your PATH or set LIBOMP_LLVM_LIT_EXECUTABLE to its full path")
+    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!")
     return()
   endif()
   # Set lit arguments
   # The -j 1 lets the actual tests run with the entire machine.
   # We have one test thread that spawns the tests serially.  This allows
   # Each test to use the entire machine.
   set(LIBOMP_LIT_ARGS_DEFAULT "-sv --show-unsupported --show-xfail")