@@ -13,7 +13,7 @@ if(MSVC AND (MSVC_VERSION LESS 1900))
13
13
endif ()
14
14
15
15
# This project follows semantic versioning (https://semver.org/)
16
- project (level-zero VERSION 1.22.2 )
16
+ project (level-zero VERSION 1.22.3 )
17
17
18
18
include (GNUInstallDirs )
19
19
@@ -252,30 +252,34 @@ install(FILES ${LEVEL_ZERO_LOADER_API_HEADERS}
252
252
COMPONENT ${SDK_COMPONENT_STRING}
253
253
)
254
254
255
+ if (MSVC )
256
+ set (PYTHON_EXECUTABLE "python" )
257
+ else ()
258
+ set (PYTHON_EXECUTABLE "python3" )
259
+ endif ()
255
260
set (PRODUCT_GUID_FILE "${CMAKE_CURRENT_SOURCE_DIR} /PRODUCT_GUID.txt" )
256
261
if (EXISTS "${PRODUCT_GUID_FILE} " )
257
262
file (STRINGS "${PRODUCT_GUID_FILE} " SAVED_PRODUCT_GUID )
258
263
list (GET SAVED_PRODUCT_GUID 0 SAVED_PRODUCT_GUID_VERSION )
259
264
message (STATUS "Saved Product GUID: ${SAVED_PRODUCT_GUID_VERSION} " )
260
265
message (STATUS "project version: ${PROJECT_VERSION} " )
261
266
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 )
273
277
endif ()
274
278
else ()
275
279
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
279
283
)
280
284
file (WRITE "${PRODUCT_GUID_FILE} " "${PROJECT_VERSION} \n ${GENERATED_PRODUCT_GUID} " )
281
285
endif ()
@@ -385,4 +389,4 @@ if(CPACK_GENERATOR MATCHES "DEB")
385
389
set (CPACK_ARCHIVE_COMPONENT_INSTALL ON )
386
390
endif ()
387
391
388
- INCLUDE (CPack )
392
+ INCLUDE (CPack )
0 commit comments