Fix fetching L0 and CUDA headers and add UMF_CUDA_INCLUDE_DIR

Fetch L0 loader only if needed i.e.:
if building L0 provider is ON and L0 headers are not provided
by the user (via setting UMF_LEVEL_ZERO_INCLUDE_DIR).

Fetch CUDA only if needed i.e.:
if building CUDA provider is ON and CUDA headers are not provided
by the user (via setting UMF_CUDA_INCLUDE_DIR).

Ref: #825

Fixes: #827

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

Author: ldorau

src/CMakeLists.txt

@@ -6,17 +6,19 @@ include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
 
 set(UMF_LEVEL_ZERO_INCLUDE_DIR
     ""
-    CACHE PATH "Directory containing the Level Zero Headers")
+    CACHE PATH "Directory containing the Level Zero headers")
+set(UMF_CUDA_INCLUDE_DIR
+    ""
+    CACHE PATH "Directory containing the CUDA headers")
 
 # Compile definitions for UMF library.
 #
 # TODO: Cleanup the compile definitions across all the CMake files
 set(UMF_COMMON_COMPILE_DEFINITIONS UMF_VERSION=${UMF_VERSION})
 
-# Only fetch L0 loader if needed (L0 provider and GPU tests are ON), and not
-# already provided by the user (via setting UMF_LEVEL_ZERO_INCLUDE_DIR).
-if(UMF_BUILD_LEVEL_ZERO_PROVIDER AND (UMF_BUILD_GPU_TESTS
-                                      OR (NOT UMF_LEVEL_ZERO_INCLUDE_DIR)))
+# Fetch L0 loader only if needed i.e.: if building L0 provider is ON and L0
+# headers are not provided by the user (via setting UMF_LEVEL_ZERO_INCLUDE_DIR).
+if(UMF_BUILD_LEVEL_ZERO_PROVIDER AND (NOT UMF_LEVEL_ZERO_INCLUDE_DIR))
     include(FetchContent)
 
     set(LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
@@ -36,15 +38,19 @@ if(UMF_BUILD_LEVEL_ZERO_PROVIDER AND (UMF_BUILD_GPU_TESTS
 
     set(LEVEL_ZERO_INCLUDE_DIRS
         ${level-zero-loader_SOURCE_DIR}/include
-        CACHE PATH "Path to Level Zero Headers")
+        PARENT_SCOPE)
     message(STATUS "Level Zero include directory: ${LEVEL_ZERO_INCLUDE_DIRS}")
 elseif(UMF_BUILD_LEVEL_ZERO_PROVIDER)
     # Only header is needed to build UMF
-    set(LEVEL_ZERO_INCLUDE_DIRS ${UMF_LEVEL_ZERO_INCLUDE_DIR})
+    set(LEVEL_ZERO_INCLUDE_DIRS
+        ${UMF_LEVEL_ZERO_INCLUDE_DIR}
+        PARENT_SCOPE)
     message(STATUS "Level Zero include directory: ${LEVEL_ZERO_INCLUDE_DIRS}")
 endif()
 
-if(UMF_BUILD_CUDA_PROVIDER)
+# Fetch CUDA only if needed i.e.: if building CUDA provider is ON and CUDA
+# headers are not provided by the user (via setting UMF_CUDA_INCLUDE_DIR).
+if(UMF_BUILD_CUDA_PROVIDER AND (NOT UMF_CUDA_INCLUDE_DIR))
     include(FetchContent)
 
     set(CUDA_REPO
@@ -62,7 +68,13 @@ if(UMF_BUILD_CUDA_PROVIDER)
 
     set(CUDA_INCLUDE_DIRS
         ${cuda-headers_SOURCE_DIR}
-        CACHE PATH "Path to CUDA headers")
+        PARENT_SCOPE)
+    message(STATUS "CUDA include directory: ${CUDA_INCLUDE_DIRS}")
+elseif(UMF_BUILD_CUDA_PROVIDER)
+    # Only header is needed to build UMF
+    set(CUDA_INCLUDE_DIRS
+        ${UMF_CUDA_INCLUDE_DIR}
+        PARENT_SCOPE)
     message(STATUS "CUDA include directory: ${CUDA_INCLUDE_DIRS}")
 endif()