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

CMake: adapt to deprecations in CMake 3.28

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

10
CMakeLists.txt
View File

@ -422,13 +422,9 @@ if(Python_Interpreter_FOUND)
if(CALAMARES_CONFIGVALIDATOR_CHECKED) if(CALAMARES_CONFIGVALIDATOR_CHECKED)
set(_validator_deps ${CALAMARES_CONFIGVALIDATOR_RESULT}) set(_validator_deps ${CALAMARES_CONFIGVALIDATOR_RESULT})
else() else()
exec_program( execute_process(
${Python_EXECUTABLE} COMMAND ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" -x
ARGS RESULT_VARIABLE _validator_deps
"${CMAKE_SOURCE_DIR}/ci/configvalidator.py"
-x
RETURN_VALUE
_validator_deps
) )
set(CALAMARES_CONFIGVALIDATOR_CHECKED TRUE CACHE INTERNAL "Dependencies for configvalidator checked") set(CALAMARES_CONFIGVALIDATOR_CHECKED TRUE CACHE INTERNAL "Dependencies for configvalidator checked")
set(CALAMARES_CONFIGVALIDATOR_RESULT ${_validator_deps} set(CALAMARES_CONFIGVALIDATOR_RESULT ${_validator_deps}