Skip to content

Commit 79ce2b5

Browse files
authored
Fix GUID gen and update to v1.22.3 (#338)
Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
1 parent 35c037c commit 79ce2b5

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Level zero loader changelog
22

3+
## v1.22.3
4+
* Fix sysman-only initialization to block loader context retrieval when versions are incompatible
5+
* Add ability to register a TeardownCallback to notify release of L0 resources
6+
## v1.22.2
7+
* Fix zesInit to init the correct requested api version
38
## v1.22.1
49
* fix ddi compatibility to avoid assigning values which don't exist
510
* Fix static loader to request current version as the latest APIs

CMakeLists.txt

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(MSVC AND (MSVC_VERSION LESS 1900))
1313
endif()
1414

1515
# This project follows semantic versioning (https://semver.org/)
16-
project(level-zero VERSION 1.22.2)
16+
project(level-zero VERSION 1.22.3)
1717

1818
include(GNUInstallDirs)
1919

@@ -252,30 +252,34 @@ install(FILES ${LEVEL_ZERO_LOADER_API_HEADERS}
252252
COMPONENT ${SDK_COMPONENT_STRING}
253253
)
254254

255+
if (MSVC)
256+
set (PYTHON_EXECUTABLE "python")
257+
else()
258+
set (PYTHON_EXECUTABLE "python3")
259+
endif()
255260
set(PRODUCT_GUID_FILE "${CMAKE_CURRENT_SOURCE_DIR}/PRODUCT_GUID.txt")
256261
if(EXISTS "${PRODUCT_GUID_FILE}")
257262
file(STRINGS "${PRODUCT_GUID_FILE}" SAVED_PRODUCT_GUID)
258263
list(GET SAVED_PRODUCT_GUID 0 SAVED_PRODUCT_GUID_VERSION)
259264
message(STATUS "Saved Product GUID: ${SAVED_PRODUCT_GUID_VERSION}")
260265
message(STATUS "project version: ${PROJECT_VERSION}")
261266
if(NOT SAVED_PRODUCT_GUID_VERSION STREQUAL "${PROJECT_VERSION}")
262-
263-
execute_process(
264-
COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
265-
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
266-
OUTPUT_STRIP_TRAILING_WHITESPACE
267-
)
268-
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
269-
message(STATUS "Generated Product GUID: ${GENERATED_PRODUCT_GUID} for version ${PROJECT_VERSION}")
270-
else()
271-
string(REPLACE "\n" ";" GUID_CONTENTS "${SAVED_PRODUCT_GUID}")
272-
list(GET GUID_CONTENTS 1 GENERATED_PRODUCT_GUID)
267+
execute_process(
268+
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
269+
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
270+
OUTPUT_STRIP_TRAILING_WHITESPACE
271+
)
272+
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
273+
message(STATUS "Generated Product GUID: ${GENERATED_PRODUCT_GUID} for version ${PROJECT_VERSION}")
274+
else()
275+
string(REPLACE "\n" ";" GUID_CONTENTS "${SAVED_PRODUCT_GUID}")
276+
list(GET GUID_CONTENTS 1 GENERATED_PRODUCT_GUID)
273277
endif()
274278
else()
275279
execute_process(
276-
COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
277-
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
278-
OUTPUT_STRIP_TRAILING_WHITESPACE
280+
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
281+
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
282+
OUTPUT_STRIP_TRAILING_WHITESPACE
279283
)
280284
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
281285
endif()
@@ -385,4 +389,4 @@ if(CPACK_GENERATOR MATCHES "DEB")
385389
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
386390
endif()
387391

388-
INCLUDE(CPack)
392+
INCLUDE(CPack)

PRODUCT_GUID.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1.22.2
2-
3c13e883-2082-4dcb-811f-81b387aef3ac
1+
1.22.3
2+
b3491b8d-9942-47bf-be47-8741f9614566

0 commit comments

Comments
 (0)