Skip to content

Commit efa6599

Browse files
Add linking for L0 loader libs and dirs
1 parent 939e756 commit efa6599

File tree

2 files changed

+35
-4
lines changed

2 files changed

+35
-4
lines changed

CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,14 @@ if(UMF_BUILD_LEVEL_ZERO_PROVIDER AND (NOT UMF_LEVEL_ZERO_INCLUDE_DIR))
241241
FetchContent_Declare(
242242
level-zero-loader
243243
GIT_REPOSITORY ${LEVEL_ZERO_LOADER_REPO}
244-
GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
245-
EXCLUDE_FROM_ALL)
244+
GIT_TAG ${LEVEL_ZERO_LOADER_TAG})
246245
FetchContent_MakeAvailable(level-zero-loader)
246+
FetchContent_GetProperties(level-zero-loader)
247+
248+
target_compile_options(ze_loader PRIVATE
249+
$<$<IN_LIST:$<CXX_COMPILER_ID>,GNU;Clang;Intel;IntelLLVM>:-Wno-error>
250+
$<$<CXX_COMPILER_ID:MSVC>:/WX- /UUNICODE>
251+
)
247252

248253
set(LEVEL_ZERO_INCLUDE_DIRS
249254
${level-zero-loader_SOURCE_DIR}/include

src/CMakeLists.txt

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,34 @@ if(LIBHWLOC_INCLUDE_DIRS)
177177
target_include_directories(umf PRIVATE ${LIBHWLOC_INCLUDE_DIRS})
178178
endif()
179179

180-
if(LEVEL_ZERO_INCLUDE_DIRS)
181-
target_include_directories(umf PRIVATE ${LEVEL_ZERO_INCLUDE_DIRS})
180+
# if(LEVEL_ZERO_INCLUDE_DIRS)
181+
# target_include_directories(umf PRIVATE ${LEVEL_ZERO_INCLUDE_DIRS})
182+
# endif()
183+
184+
if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
185+
set(LEVEL_ZERO_LIBRARY ze_loader)
186+
187+
add_library(LevelZeroLoader INTERFACE)
188+
target_link_directories(LevelZeroLoader
189+
INTERFACE "${CMAKE_BINARY_DIR}/lib"
190+
)
191+
target_link_libraries(LevelZeroLoader
192+
INTERFACE "${LEVEL_ZERO_LIBRARY}"
193+
)
194+
195+
add_library(LevelZeroLoader-Headers INTERFACE)
196+
target_include_directories(LevelZeroLoader-Headers
197+
INTERFACE "${LEVEL_ZERO_INCLUDE_DIRS}"
198+
)
199+
200+
target_link_libraries(umf PRIVATE
201+
LevelZeroLoader
202+
LevelZeroLoader-Headers
203+
)
204+
205+
target_include_directories(umf PRIVATE
206+
LevelZeroLoader-Headers
207+
)
182208
endif()
183209

184210
if(CUDA_INCLUDE_DIRS)

0 commit comments

Comments
 (0)