diff --git a/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake b/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake --- a/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake +++ b/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake @@ -33,9 +33,16 @@ list(APPEND CMAKE_MODULE_PATH ${LLVM_CMAKE_DIR}) include(AddLLVM) else() + # Note that OPENMP_STANDALONE_BUILD is FALSE, when + # openmp is built with -DLLVM_ENABLE_RUNTIMES="openmp" vs + # -DLLVM_ENABLE_PROJECTS="openmp", but openmp build + # is actually done as a standalone project build with many + # LLVM CMake variables propagated to it. list(APPEND LIBOMPTARGET_LLVM_INCLUDE_DIRS ${LLVM_MAIN_INCLUDE_DIR} ${LLVM_BINARY_DIR}/include ) + message(STATUS + "Using LLVM include directories: ${LIBOMPTARGET_LLVM_INCLUDE_DIRS}") endif() ################################################################################ diff --git a/openmp/libomptarget/plugins/common/elf_common/CMakeLists.txt b/openmp/libomptarget/plugins/common/elf_common/CMakeLists.txt --- a/openmp/libomptarget/plugins/common/elf_common/CMakeLists.txt +++ b/openmp/libomptarget/plugins/common/elf_common/CMakeLists.txt @@ -15,6 +15,7 @@ llvm_update_compile_flags(elf_common) set(LINK_LLVM_LIBS LLVMBinaryFormat LLVMObject LLVMSupport) target_link_libraries(elf_common INTERFACE ${LINK_LLVM_LIBS} ${LIBOMPTARGET_DEP_LIBELF_LIBRARIES}) +include_directories(${LIBOMPTARGET_LLVM_INCLUDE_DIRS}) add_dependencies(elf_common ${LINK_LLVM_LIBS}) # The code uses Debug.h, which requires threads support.