Skip to content

Commit d74d079

Browse files
author
Pavel V Chupin
committed
Revert back to CMAKE_CXX_FLAGS override
1 parent 0ae0226 commit d74d079

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

sycl/plugins/level_zero/CMakeLists.txt

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,19 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
1616
GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
1717
)
1818

19+
# Suppress some pedantic warnings for Level Zero build
20+
set(CMAKE_CXX_FLAGS_BAK "${CMAKE_CXX_FLAGS}")
21+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
22+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
23+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-truncation")
24+
1925
FetchContent_MakeAvailable(level-zero-loader)
2026
FetchContent_GetProperties(level-zero-loader)
2127

22-
set(LEVEL_ZERO_LIBRARY ze_loader)
23-
24-
target_compile_options(${LEVEL_ZERO_LIBRARY} PRIVATE
25-
"-Wno-unused-but-set-variable"
26-
"-Wno-pedantic"
27-
"-Wno-stringop-truncation"
28-
)
29-
target_compile_options(ze_tracing_layer PRIVATE
30-
"-Wno-pedantic"
31-
)
32-
target_compile_options(ze_validation_layer PRIVATE
33-
"-Wno-pedantic"
34-
)
28+
# Restore original flags
29+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK}")
3530

31+
set(LEVEL_ZERO_LIBRARY ze_loader)
3632
set(LEVEL_ZERO_INCLUDE_DIR
3733
${level-zero-loader_SOURCE_DIR}/include CACHE PATH "Path to Level Zero Headers")
3834
endif()

0 commit comments

Comments
 (0)