[Openmp-commits] [PATCH] D122667: llvm14 patch: hwloc include directory for libompd

[Sajid Ali via Phabricator via Openmp-commits]

s-sajid-ali created this revision.
s-sajid-ali added a reviewer: Ericson2314.
s-sajid-ali added a project: OpenMP.
Herald added a subscriber: mgorny.
Herald added a project: All.
s-sajid-ali requested review of this revision.
Herald added a reviewer: jdoerfert.
Herald added subscribers: openmp-commits, sstefan1.

Patch to fix build error for libompd due to missing `hwloc` header location. Full details of build error at https://github.com/spack/spack/issues/29751 and summary available at https://github.com/llvm/llvm-project/issues/54621


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D122667

Files:
  openmp/runtime/src/CMakeLists.txt


Index: openmp/runtime/src/CMakeLists.txt
===================================================================
--- openmp/runtime/src/CMakeLists.txt
+++ openmp/runtime/src/CMakeLists.txt
@@ -198,7 +198,11 @@
 else()
   set(LIBOMP_LIBRARY_DIR ${LIBOMP_LIBRARY_DIR} PARENT_SCOPE)
 endif()
-set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+if(${LIBOMP_USE_HWLOC})
+  set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} ${LIBOMP_HWLOC_INSTALL_DIR}/include PARENT_SCOPE)
+else()
+  set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+endif()
 
 # Add symbolic links to libomp
 if(NOT WIN32)
@@ -210,7 +214,11 @@
     WORKING_DIRECTORY ${LIBOMP_LIBRARY_DIR}
   )
 endif()
-set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+if(${LIBOMP_USE_HWLOC})
+  set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} ${LIBOMP_HWLOC_INSTALL_DIR}/include PARENT_SCOPE)
+else()
+  set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+endif()
 
 # Create *.inc before compiling any sources
 # objects depend on : .inc files


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D122667.418914.patch
Type: text/x-patch
Size: 1055 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20220329/04038b5c/attachment.bin>