qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop CMAKE_SYSTEM_VERSION from modules json if Linux 

In order to make the project build reproducible it should not record
transient information of the build host.

The linux kernel is not encoded in the source, and the value from the
modules.json does not seem to be used anywhere, so we can drop it for
now.

Fixes: QTBUG-136060
Change-Id: Ic157d66d47040b080e9121fd065a8d60d489f586
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Cristian Le 2025-06-19 17:12:46 +02:00
parent f84faa4226
commit dc52aa68ea
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/ModuleDescription.json.in
View File

@ -1,5 +1,5 @@
{
"schema_version": 2,
"schema_version": 3,
"name": "${target}",
"repository": "${lower_case_project_name}",
"version": "${PROJECT_VERSION}",${extra_module_information}

6
cmake/QtModuleHelpers.cmake
View File

@ -1551,9 +1551,13 @@ ${indent3}\"name\": \"${platform_name}\",")
string(APPEND platforms_information "
${indent3}\"variant\": \"${platform_variant}\",")
endif()
if(NOT "${CMAKE_SYSTEM_VERSION}" STREQUAL "")
if(NOT "${CMAKE_SYSTEM_VERSION}" STREQUAL "" AND
NOT platform_name STREQUAL "Linux")
string(APPEND platforms_information "
${indent3}\"version\": \"${CMAKE_SYSTEM_VERSION}\",")
else()
string(APPEND platforms_information "
${indent3}\"version\": null,")
endif()
string(APPEND platforms_information "
${indent3}\"compiler_id\": \"${CMAKE_CXX_COMPILER_ID}\",