Skip to content

Commit a49128a

Browse files
committed
Fixed GUID generation and updated version
Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
1 parent e75ecd6 commit a49128a

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

CMakeLists.txt

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -252,30 +252,32 @@ install(FILES ${LEVEL_ZERO_LOADER_API_HEADERS}
252252
COMPONENT ${SDK_COMPONENT_STRING}
253253
)
254254

255+
find_package(PythonInterp 3 REQUIRED)
256+
set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
257+
255258
set(PRODUCT_GUID_FILE "${CMAKE_CURRENT_SOURCE_DIR}/PRODUCT_GUID.txt")
256259
if(EXISTS "${PRODUCT_GUID_FILE}")
257260
file(STRINGS "${PRODUCT_GUID_FILE}" SAVED_PRODUCT_GUID)
258261
list(GET SAVED_PRODUCT_GUID 0 SAVED_PRODUCT_GUID_VERSION)
259262
message(STATUS "Saved Product GUID: ${SAVED_PRODUCT_GUID_VERSION}")
260263
message(STATUS "project version: ${PROJECT_VERSION}")
261264
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)
265+
execute_process(
266+
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
267+
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
268+
OUTPUT_STRIP_TRAILING_WHITESPACE
269+
)
270+
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
271+
message(STATUS "Generated Product GUID: ${GENERATED_PRODUCT_GUID} for version ${PROJECT_VERSION}")
272+
else()
273+
string(REPLACE "\n" ";" GUID_CONTENTS "${SAVED_PRODUCT_GUID}")
274+
list(GET GUID_CONTENTS 1 GENERATED_PRODUCT_GUID)
273275
endif()
274276
else()
275277
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
278+
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
279+
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
280+
OUTPUT_STRIP_TRAILING_WHITESPACE
279281
)
280282
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
281283
endif()

PRODUCT_GUID.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1.21.9
2-
01037281-c9ef-43cf-bc65-f72fb3438788
1+
1.23.0
2+
146652e2-0b5a-4461-b176-800135676a46

0 commit comments

Comments
 (0)