napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: be more chatty around results of validation-dependency check

Browse Source
This commit is contained in:
Adriaan de Groot 2023-10-28 22:32:11 +02:00
parent 627cb6b90a
commit ee90fee7bb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -420,6 +420,7 @@ if(Python_Interpreter_FOUND)
# and if they are not installed, don't run. If errors out # and if they are not installed, don't run. If errors out
# with exit(1) on missing dependencies. # with exit(1) on missing dependencies.
if(CALAMARES_CONFIGVALIDATOR_CHECKED) if(CALAMARES_CONFIGVALIDATOR_CHECKED)
message(STATUS "Using cached config-validation result")
set(_validator_deps ${CALAMARES_CONFIGVALIDATOR_RESULT}) set(_validator_deps ${CALAMARES_CONFIGVALIDATOR_RESULT})
else() else()
execute_process( execute_process(
@ -433,14 +434,20 @@ if(Python_Interpreter_FOUND)
endif() endif()
# It should never succeed, but only returns 1 when the imports fail # It should never succeed, but only returns 1 when the imports fail
if(_validator_deps EQUAL 1) if(_validator_deps EQUAL 1)
message(STATUS "Checked for config-validation dependencies: NOT-FOUND")
set(_schema_explanation " Missing dependencies for configvalidator.py.") set(_schema_explanation " Missing dependencies for configvalidator.py.")
set(BUILD_SCHEMA_TESTING OFF) set(BUILD_SCHEMA_TESTING OFF)
else()
message(STATUS "Checked for config-validation dependencies: found")
endif() endif()
else()
set(CALAMARES_CONFIGVALIDATOR_CHECKED OFF CACHE INTERNAL "Dependencies for configvalidator checked")
endif() endif()
else() else()
# Can't run schema tests without Python3. # Can't run schema tests without Python3.
set(_schema_explanation " Missing Python3.") set(_schema_explanation " Missing Python3.")
set(BUILD_SCHEMA_TESTING OFF) set(BUILD_SCHEMA_TESTING OFF)
set(CALAMARES_CONFIGVALIDATOR_CHECKED OFF CACHE INTERNAL "Dependencies for configvalidator checked")
endif() endif()
add_feature_info(yaml-schema BUILD_SCHEMA_TESTING "Validate YAML (config files) with schema.${_schema_explanation}") add_feature_info(yaml-schema BUILD_SCHEMA_TESTING "Validate YAML (config files) with schema.${_schema_explanation}")