Skip to content

Commit eecd9f1

Browse files
authored
Merge pull request #2434 from tcreech-intel/external_umf
[CMake] Add UR_USE_EXTERNAL_UMF to find pre-built UMF
2 parents c7cc03b + d9ee0f6 commit eecd9f1

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

source/common/CMakeLists.txt

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,22 @@ if (UR_STATIC_ADAPTER_L0)
5454
endif()
5555
endif()
5656

57-
set(UMF_BUILD_TESTS OFF CACHE INTERNAL "Build UMF tests")
58-
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "Build UMF examples")
59-
set(UMF_BUILD_SHARED_LIBRARY ${UMF_BUILD_SHARED_LIBRARY} CACHE INTERNAL "Build UMF shared library")
60-
set(UMF_BUILD_LIBUMF_POOL_DISJOINT ON CACHE INTERNAL "Build Disjoint Pool")
61-
set(UMF_BUILD_CUDA_PROVIDER OFF CACHE INTERNAL "Build UMF CUDA provider")
62-
63-
FetchContent_MakeAvailable(unified-memory-framework)
64-
FetchContent_GetProperties(unified-memory-framework)
57+
set(UR_USE_EXTERNAL_UMF OFF CACHE BOOL "Use a pre-built UMF")
58+
59+
if (UR_USE_EXTERNAL_UMF)
60+
find_package(umf REQUIRED)
61+
# Add an alias matching the FetchContent case
62+
add_library(umf::headers ALIAS umf::umf_headers)
63+
else()
64+
set(UMF_BUILD_TESTS OFF CACHE INTERNAL "Build UMF tests")
65+
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "Build UMF examples")
66+
set(UMF_BUILD_SHARED_LIBRARY ${UMF_BUILD_SHARED_LIBRARY} CACHE INTERNAL "Build UMF shared library")
67+
set(UMF_BUILD_LIBUMF_POOL_DISJOINT ON CACHE INTERNAL "Build Disjoint Pool")
68+
set(UMF_BUILD_CUDA_PROVIDER OFF CACHE INTERNAL "Build UMF CUDA provider")
69+
70+
FetchContent_MakeAvailable(unified-memory-framework)
71+
FetchContent_GetProperties(unified-memory-framework)
72+
endif()
6573

6674
if(UR_ENABLE_LATENCY_HISTOGRAM)
6775
set(HDR_HISTOGRAM_BUILD_STATIC CACHE INTERNAL ON "")

0 commit comments

Comments
 (0)