Merge pull request oneapi-src#1061 from jandres742/updateL0loader

[UR][L0] Upgrade L0 loader to v1.15.1
kbenzie · Dec 15, 2023 · 7e098bc · 7e098bc
1 parent 3748aaf
commit 7e098bc
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/source/adapters/level_zero/CMakeLists.txt b/source/adapters/level_zero/CMakeLists.txt
@@ -22,8 +22,19 @@ endif()
 if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
  message(STATUS "Download Level Zero loader and headers from github.com")
 
+ # Workaround warnings/errors for Level Zero build
+ set(CMAKE_CXX_FLAGS_BAK "${CMAKE_CXX_FLAGS}")
+ if (UNIX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-truncation")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++98-compat-extra-semi")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
+ endif()
+
  set(LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
- set(LEVEL_ZERO_LOADER_TAG v1.11.0)
+ set(LEVEL_ZERO_LOADER_TAG v1.15.1)
 
  # Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
  set(CMAKE_INCLUDE_CURRENT_DIR OFF)
@@ -42,6 +53,9 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
  FetchContent_MakeAvailable(level-zero-loader)
  FetchContent_GetProperties(level-zero-loader)
 
+ # Restore original flags
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK}")
+
  target_compile_options(ze_loader PRIVATE
  $<$<IN_LIST:$<CXX_COMPILER_ID>,GNU;Clang;Intel;IntelLLVM>:-Wno-error>
  $<$<CXX_COMPILER_ID:MSVC>:/WX- /UUNICODE>