From 35791b51d4ca11a2e20eb52a4e2872a49286def1 Mon Sep 17 00:00:00 2001 From: hdelaney Date: Wed, 12 Mar 2025 15:15:47 +0000 Subject: [PATCH] Don't link HWLOC statically if disabled --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index a61cd975fea60..5406a096f25db 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -83,7 +83,9 @@ if(IS_DIRECTORY "${UR_INTREE_SOURCE_DIR}") # to link statically on windows if(WIN32) set(UMF_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "Build UMF shared library") - set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC") + if (NOT UMF_DISABLE_HWLOC) + set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC") + endif() else() set(UMF_DISABLE_HWLOC ${SYCL_UMF_DISABLE_HWLOC} CACHE INTERNAL "Disable hwloc for UMF") endif() @@ -142,7 +144,9 @@ elseif(SYCL_UR_USE_FETCH_CONTENT) # to link statically on windows if(WIN32) set(UMF_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "Build UMF shared library") - set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC") + if (NOT UMF_DISABLE_HWLOC) + set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC") + endif() else() set(UMF_DISABLE_HWLOC ${SYCL_UMF_DISABLE_HWLOC} CACHE INTERNAL "Disable hwloc for UMF") endif()