Skip to content

Commit 28d45cb

Browse files
committed
Fix check for level zero headers
1 parent 2c152ae commit 28d45cb

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
#
1515
# The module uses git to clone the Level Zero source repository into the
16-
# CMAKE_CURRENT_BINARY_DIR. The path to the Level Zero headers is then returned
16+
# CMAKE_BINARY_DIR. The path to the Level Zero headers is then returned
1717
# to the caller in the LEVEL_ZERO_INCLUDE_DIR variable.
1818
#
1919
# Example usage:
@@ -26,13 +26,12 @@
2626

2727
function(get_level_zero_headers)
2828

29-
if(EXISTS level-zero)
30-
# Update the checkout
29+
if(EXISTS "${CMAKE_BINARY_DIR}/level-zero/.git")
3130
execute_process(
3231
COMMAND ${GIT_EXECUTABLE} fetch
3332
RESULT_VARIABLE result
3433
ERROR_VARIABLE error
35-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/level-zero
34+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/level-zero"
3635
OUTPUT_STRIP_TRAILING_WHITESPACE
3736
ERROR_STRIP_TRAILING_WHITESPACE
3837
)
@@ -43,11 +42,15 @@ function(get_level_zero_headers)
4342
)
4443
endif()
4544
else()
45+
# remove level-zero directory if it exists
46+
file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/level-zero")
47+
4648
# Clone the Level Zero git repo
4749
execute_process(
4850
COMMAND ${GIT_EXECUTABLE} clone https://github.com/oneapi-src/level-zero.git
4951
RESULT_VARIABLE result
5052
ERROR_VARIABLE error
53+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
5154
OUTPUT_STRIP_TRAILING_WHITESPACE
5255
ERROR_STRIP_TRAILING_WHITESPACE
5356
)
@@ -65,7 +68,7 @@ function(get_level_zero_headers)
6568
RESULT_VARIABLE result
6669
OUTPUT_VARIABLE latest_tag
6770
ERROR_VARIABLE error
68-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/level-zero
71+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/level-zero"
6972
OUTPUT_STRIP_TRAILING_WHITESPACE
7073
ERROR_STRIP_TRAILING_WHITESPACE
7174
)
@@ -81,7 +84,7 @@ function(get_level_zero_headers)
8184
COMMAND ${GIT_EXECUTABLE} checkout ${latest_tag}
8285
RESULT_VARIABLE result
8386
ERROR_VARIABLE error
84-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/level-zero
87+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/level-zero"
8588
OUTPUT_STRIP_TRAILING_WHITESPACE
8689
ERROR_STRIP_TRAILING_WHITESPACE
8790
)
@@ -95,7 +98,7 @@ function(get_level_zero_headers)
9598
# Populate the path to the headers
9699
find_path(LEVEL_ZERO_INCLUDE_DIR
97100
NAMES zet_api.h
98-
PATHS ${CMAKE_BINARY_DIR}/level-zero/include
101+
PATHS "${CMAKE_BINARY_DIR}/level-zero/include"
99102
NO_DEFAULT_PATH
100103
NO_CMAKE_ENVIRONMENT_PATH
101104
NO_CMAKE_PATH

0 commit comments

Comments
 (0)