Skip to content

Commit 0a06c33

Browse files
Fixed empty LIBZE_LOADER_FILENAME and LIBCL_LOADER_FILENAME
Variables were set in the nested scope and not propagated to the parent scope. The config also has erroneous space before the trailing @ symbol.
1 parent 27462c5 commit 0a06c33

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

libsyclinterface/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ if(DPCTL_ENABLE_L0_PROGRAM_CREATION)
6767
OUTPUT_VARIABLE LIBZE_LOADER_FILENAME
6868
OUTPUT_STRIP_TRAILING_WHITESPACE
6969
ERROR_STRIP_TRAILING_WHITESPACE
70-
)
70+
)
71+
set(LIBZE_LOADER_FILENAME ${LIBZE_LOADER_FILENAME} PARENT_SCOPE)
7172
endif()
73+
set(LIBZE_LOADER_FILENAME ${LIBZE_LOADER_FILENAME} PARENT_SCOPE)
7274
endif()
7375

7476
if (UNIX)
@@ -86,8 +88,12 @@ if (UNIX)
8688
OUTPUT_STRIP_TRAILING_WHITESPACE
8789
ERROR_STRIP_TRAILING_WHITESPACE
8890
)
91+
set(LIBCL_LOADER_FILENAME ${LIBCL_LOADER_FILENAME} PARENT_SCOPE)
8992
endif()
9093

94+
message(STATUS "LIB_ZE: ${LIBZE_LOADER_FILENAME}")
95+
message(STATUS "LIB_CL: ${LIBCL_LOADER_FILENAME}")
96+
9197
configure_file(
9298
${CMAKE_CURRENT_SOURCE_DIR}/include/Config/dpctl_config.h.in
9399
${CMAKE_CURRENT_SOURCE_DIR}/include/Config/dpctl_config.h

libsyclinterface/include/Config/dpctl_config.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/* Defined when dpctl was built with level zero program creation enabled. */
2929
#cmakedefine DPCTL_ENABLE_L0_PROGRAM_CREATION \
30-
@DPCTL_ENABLE_L0_PROGRAM_CREATION @
30+
@DPCTL_ENABLE_L0_PROGRAM_CREATION@
3131

3232
/* The DPCPP version used to build dpctl */
3333
#define DPCTL_DPCPP_VERSION "@IntelSycl_VERSION@"

0 commit comments

Comments
 (0)