diff --git a/openmp/README.rst b/openmp/README.rst --- a/openmp/README.rst +++ b/openmp/README.rst @@ -248,8 +248,8 @@ out-of-tree builds. **LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER** = ``""`` - Path of the folder that contains ``libomp.so``. This is required for testing - out-of-tree builds. + Path of the folder that contains ``libomp.so``, and ``libLLVMSupport.so`` + when profiling is enabled. This is required for testing. Options for ``NVPTX device RTL`` -------------------------------- diff --git a/openmp/libomptarget/CMakeLists.txt b/openmp/libomptarget/CMakeLists.txt --- a/openmp/libomptarget/CMakeLists.txt +++ b/openmp/libomptarget/CMakeLists.txt @@ -68,14 +68,10 @@ add_subdirectory(${LIBOMPTARGET_SRC_DIR}) # Definitions for testing, for reuse when testing libomptarget-nvptx. -if(OPENMP_STANDALONE_BUILD) - set(LIBOMPTARGET_OPENMP_HEADER_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/../runtime/src" CACHE STRING - "Path to folder containing omp.h") - set(LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/../runtime/src" CACHE STRING - "Path to folder containing libomp.so") -else() - set(LIBOMPTARGET_OPENMP_HEADER_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/../runtime/src") -endif() +set(LIBOMPTARGET_OPENMP_HEADER_FOLDER "${LIBOMP_INCLUDE_DIR}" CACHE STRING + "Path to folder containing omp.h") +set(LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER "${LIBOMP_LIBRARY_DIR}" CACHE STRING + "Path to folder containing libomp.so, and libLLVMSupport.so with profiling enabled") # Build offloading plugins and device RTLs if they are available.