diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-04-26 11:01:17 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-04-26 11:01:17 +0000 |
| commit | 05a1ee0cf4d5948ec2a084629bb9712af7d9c475 (patch) | |
| tree | 91bab74096260d12d8f4a2300bcd84f3bdb17b99 /CMake | |
| parent | edfbc3869361f709d70794a794199ac2076ea9f1 (diff) | |
| parent | 7a1063e81b855ac7ff9ee54f115843c3af6dd1bf (diff) | |
Merge branch 'fix/mixed' into 'main'
Split out of mostly independent fixes: cmake execute errors, removed rev-deps, protected garbage & co
See merge request apt-team/apt!345
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/vendor_substitute.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMake/vendor_substitute.cmake b/CMake/vendor_substitute.cmake index 71449c9e8..277cb3ac9 100644 --- a/CMake/vendor_substitute.cmake +++ b/CMake/vendor_substitute.cmake @@ -2,7 +2,8 @@ file(READ ${IN} input) foreach(variable ${VARS}) execute_process(COMMAND ${PROJECT_SOURCE_DIR}/vendor/getinfo --vendor ${CURRENT_VENDOR} ${variable} - OUTPUT_VARIABLE value OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_VARIABLE value OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY) string(REPLACE "&${variable};" "${value}" input "${input}") endforeach() file(WRITE ${OUT} "${input}") |