diff options
Diffstat (limited to 'openmp/runtime/cmake/config-ix.cmake')
| -rw-r--r-- | openmp/runtime/cmake/config-ix.cmake | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/openmp/runtime/cmake/config-ix.cmake b/openmp/runtime/cmake/config-ix.cmake index b1f8b6711c0..206e689029d 100644 --- a/openmp/runtime/cmake/config-ix.cmake +++ b/openmp/runtime/cmake/config-ix.cmake @@ -246,23 +246,22 @@ endif() # Check if HWLOC support is available if(${LIBOMP_USE_HWLOC}) - if(WIN32) - set(LIBOMP_HAVE_HWLOC FALSE) - libomp_say("Using hwloc not supported on Windows yet") - else() - set(CMAKE_REQUIRED_INCLUDES ${LIBOMP_HWLOC_INSTALL_DIR}/include) - check_include_file(hwloc.h LIBOMP_HAVE_HWLOC_H) - set(CMAKE_REQUIRED_INCLUDES) - check_library_exists(hwloc hwloc_topology_init + set(CMAKE_REQUIRED_INCLUDES ${LIBOMP_HWLOC_INSTALL_DIR}/include) + check_include_file(hwloc.h LIBOMP_HAVE_HWLOC_H) + set(CMAKE_REQUIRED_INCLUDES) + find_library(LIBOMP_HWLOC_LIBRARY + NAMES hwloc libhwloc + HINTS ${LIBOMP_HWLOC_INSTALL_DIR}/lib) + if(LIBOMP_HWLOC_LIBRARY) + check_library_exists(${LIBOMP_HWLOC_LIBRARY} hwloc_topology_init ${LIBOMP_HWLOC_INSTALL_DIR}/lib LIBOMP_HAVE_LIBHWLOC) - find_library(LIBOMP_HWLOC_LIBRARY hwloc ${LIBOMP_HWLOC_INSTALL_DIR}/lib) get_filename_component(LIBOMP_HWLOC_LIBRARY_DIR ${LIBOMP_HWLOC_LIBRARY} PATH) - if(LIBOMP_HAVE_HWLOC_H AND LIBOMP_HAVE_LIBHWLOC AND LIBOMP_HWLOC_LIBRARY) - set(LIBOMP_HAVE_HWLOC TRUE) - else() - set(LIBOMP_HAVE_HWLOC FALSE) - libomp_say("Could not find hwloc") - endif() + endif() + if(LIBOMP_HAVE_HWLOC_H AND LIBOMP_HAVE_LIBHWLOC AND LIBOMP_HWLOC_LIBRARY) + set(LIBOMP_HAVE_HWLOC TRUE) + else() + set(LIBOMP_HAVE_HWLOC FALSE) + libomp_say("Could not find hwloc") endif() endif() |
