Fix using LIBHWLOC_INCLUDE_DIRS in tests

LIBHWLOC_INCLUDE_DIRS should be used always
when hwloc is not disabled.

Ref: oneapi-src#1066

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

CMakeLists.txt

@@ -334,7 +334,7 @@ else()
     endif()
 
     message(STATUS "    LIBHWLOC_LIBRARIES = ${LIBHWLOC_LIBRARIES}")
-    message(STATUS "    LIBHWLOC_INCLUDE_DIRS = ${LIBHWLOC_INCLUDE_DIRS}")
+    message(STATUS "    LIBHWLOC_INCLUDE_DIRS (1) = ${LIBHWLOC_INCLUDE_DIRS}")
     message(STATUS "    LIBHWLOC_LIBRARY_DIRS = ${LIBHWLOC_LIBRARY_DIRS}")
 endif()
 

cmake/FindLIBHWLOC.cmake

@@ -47,7 +47,7 @@ endif()
 if(LIBHWLOC_LIBRARY)
     message(STATUS "  Found libhwloc using find_library()")
     message(STATUS "    LIBHWLOC_LIBRARIES = ${LIBHWLOC_LIBRARIES}")
-    message(STATUS "    LIBHWLOC_INCLUDE_DIRS = ${LIBHWLOC_INCLUDE_DIRS}")
+    message(STATUS "    LIBHWLOC_INCLUDE_DIRS (2) = ${LIBHWLOC_INCLUDE_DIRS}")
     message(STATUS "    LIBHWLOC_LIBRARY_DIRS = ${LIBHWLOC_LIBRARY_DIRS}")
     message(STATUS "    LIBHWLOC_API_VERSION = ${LIBHWLOC_API_VERSION}")
     if(WINDOWS)

examples/cmake/FindLIBHWLOC.cmake

@@ -47,7 +47,7 @@ endif()
 if(LIBHWLOC_LIBRARY)
     message(STATUS "  Found libhwloc using find_library()")
     message(STATUS "    LIBHWLOC_LIBRARIES = ${LIBHWLOC_LIBRARIES}")
-    message(STATUS "    LIBHWLOC_INCLUDE_DIRS = ${LIBHWLOC_INCLUDE_DIRS}")
+    message(STATUS "    LIBHWLOC_INCLUDE_DIRS (3) = ${LIBHWLOC_INCLUDE_DIRS}")
     message(STATUS "    LIBHWLOC_LIBRARY_DIRS = ${LIBHWLOC_LIBRARY_DIRS}")
     message(STATUS "    LIBHWLOC_API_VERSION = ${LIBHWLOC_API_VERSION}")
     if(WINDOWS)

test/CMakeLists.txt

@@ -59,7 +59,7 @@ function(build_umf_test)
         set(INC_DIRS ${INC_DIRS} ${LEVEL_ZERO_INCLUDE_DIRS})
     endif()
 
-    if(UMF_LINK_HWLOC_STATICALLY)
+    if(NOT UMF_DISABLE_HWLOC)
         set(INC_DIRS ${INC_DIRS} ${LIBHWLOC_INCLUDE_DIRS})
     endif()