diff options
| author | Cristian Le <[email protected]> | 2025-06-19 17:12:46 +0200 |
|---|---|---|
| committer | Cristian Le <[email protected]> | 2025-06-23 15:48:25 +0200 |
| commit | dc52aa68ea305d8ef40f8b514bfeba80cd6c2c1e (patch) | |
| tree | aa11a5d4ed8d2379af0990851e2aaac919a540c5 | |
| parent | f84faa42266e10325bc4b192d2239db9ac19f108 (diff) | |
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 <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>
| -rw-r--r-- | cmake/ModuleDescription.json.in | 2 | ||||
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cmake/ModuleDescription.json.in b/cmake/ModuleDescription.json.in index e8b58387d9e..5d41bc8e377 100644 --- a/cmake/ModuleDescription.json.in +++ b/cmake/ModuleDescription.json.in @@ -1,5 +1,5 @@ { - "schema_version": 2, + "schema_version": 3, "name": "${target}", "repository": "${lower_case_project_name}", "version": "${PROJECT_VERSION}",${extra_module_information} diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 2f260d90f04..ac27997461e 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -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}\", |