Add requirement for HWLOC version

HWLOC library needs to be at least version 2.3.0 as it introduces
the API used in NUMA node property querying used for memspace
creation.

Author: kswiecicki

CMakeLists.txt

@@ -169,9 +169,9 @@ if(WINDOWS)
     )
 endif()
 
-pkg_check_modules(LIBHWLOC hwloc)
+pkg_check_modules(LIBHWLOC hwloc>=2.3.0)
 if(NOT LIBHWLOC_FOUND)
-    find_package(LIBHWLOC REQUIRED hwloc)
+    find_package(LIBHWLOC 2.3.0 REQUIRED hwloc)
 endif()
 # add PATH to DLL on Windows
 set(DLL_PATH_LIST

README.md

@@ -25,7 +25,7 @@ which includes the code of the basic [example](https://github.com/oneapi-src/uni
 ### Requirements
 
 Required packages:
-- libhwloc-dev (Linux) / hwloc (Windows)
+- libhwloc-dev >= 2.3.0 (Linux) / hwloc >= 2.3.0 (Windows)
 - C compiler
 - [CMake](https://cmake.org/) >= 3.14.0
 

cmake/FindLIBHWLOC.cmake

@@ -14,8 +14,32 @@ find_file(LIBHWLOC_HEADER NAMES hwloc.h)
 get_filename_component(LIBHWLOC_INCLUDE_DIR ${LIBHWLOC_HEADER} DIRECTORY)
 set(LIBHWLOC_INCLUDE_DIRS ${LIBHWLOC_INCLUDE_DIR})
 
+if(LIBHWLOC_INCLUDE_DIR)
+    if(EXISTS "${LIBHWLOC_INCLUDE_DIR}/hwloc/autogen/config.h")
+        file(
+            STRINGS "${LIBHWLOC_INCLUDE_DIR}/hwloc/autogen/config.h"
+            LIBHWLOC_VERSION
+            REGEX
+                "#define[ \t]HWLOC_VERSION[ \t]\"([0-9]+.[0-9]+.[0-9]+(rc[0-9])?)(-git)?\""
+        )
+        string(
+            REGEX
+            REPLACE
+                "#define[ \t]HWLOC_VERSION[ \t]\"([0-9]+.[0-9]+.[0-9]+(rc[0-9])?)(-git)?\""
+                "\\1"
+                LIBHWLOC_VERSION
+                "${LIBHWLOC_VERSION}")
+    else()
+        message(
+            WARNING
+                "LIBHWLOC_INCLUDE_DIR found, but header with version info is missing"
+        )
+    endif()
+endif()
+
 if(WINDOWS)
-    find_file(LIBHWLOC_DLL NAMES "bin/hwloc-15.dll" "bin/libhwloc-15.dll")
+    file(GLOB LIBHWLOC_DLL "${LIBHWLOC_LIB_DIR}/bin/hwloc-*.dll"
+         "${LIBHWLOC_LIB_DIR}/bin/libhwloc-*.dll")
     get_filename_component(LIBHWLOC_DLL_DIR ${LIBHWLOC_DLL} DIRECTORY)
     set(LIBHWLOC_DLL_DIRS ${LIBHWLOC_DLL_DIR})
 endif()
@@ -25,9 +49,21 @@ if(LIBHWLOC_LIBRARY)
     message(STATUS "    LIBHWLOC_LIBRARIES = ${LIBHWLOC_LIBRARIES}")
     message(STATUS "    LIBHWLOC_INCLUDE_DIRS = ${LIBHWLOC_INCLUDE_DIRS}")
     message(STATUS "    LIBHWLOC_LIBRARY_DIRS = ${LIBHWLOC_LIBRARY_DIRS}")
+    message(STATUS "    LIBHWLOC_VERSION = ${LIBHWLOC_VERSION}")
     if(WINDOWS)
         message(STATUS "    LIBHWLOC_DLL_DIRS = ${LIBHWLOC_DLL_DIRS}")
     endif()
+
+    if(LIBHWLOC_FIND_VERSION)
+        if(NOT LIBHWLOC_VERSION)
+            message(WARNING "Failed to retrieve libhwloc version")
+        elseif(NOT LIBHWLOC_VERSION VERSION_GREATER_EQUAL LIBHWLOC_FIND_VERSION)
+            message(
+                FATAL_ERROR
+                    "    Required version: ${LIBHWLOC_FIND_VERSION}, found ${LIBHWLOC_VERSION}"
+            )
+        endif()
+    endif()
 else()
     set(MSG_NOT_FOUND
         "libhwloc NOT found (set CMAKE_PREFIX_PATH to point the location)")