From c1b77920f2878f11c71edd35167bb59851397718 Mon Sep 17 00:00:00 2001 From: Bruno Vavala Date: Thu, 24 Oct 2024 15:42:22 +0000 Subject: [PATCH] switching from git apply patch to patch because the attestation api is not a standalone repo anymore -- thanks michael for spotting this Signed-off-by: Bruno Vavala --- common/crypto/attestation-api/common/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/crypto/attestation-api/common/CMakeLists.txt b/common/crypto/attestation-api/common/CMakeLists.txt index 9b92ef9b..0429b010 100644 --- a/common/crypto/attestation-api/common/CMakeLists.txt +++ b/common/crypto/attestation-api/common/CMakeLists.txt @@ -8,7 +8,7 @@ SET(JWT_PATCHED_FILEPATH ${CMAKE_CURRENT_SOURCE_DIR}/${JWT_PATCHED_FILENAME} PAR ADD_CUSTOM_COMMAND( OUTPUT ${JWT_PATCHED_FILENAME} - COMMAND [ ! -f ${JWT_PATCHED_FILENAME} ] && cd jwt-cpp && git apply ../jwt-cpp.patch && touch ../${JWT_PATCHED_FILENAME} || true + COMMAND [ ! -f ${JWT_PATCHED_FILENAME} ] && cd jwt-cpp && patch -f -p1 < ../jwt-cpp.patch && touch ../${JWT_PATCHED_FILENAME} || true WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) @@ -16,7 +16,7 @@ ADD_CUSTOM_TARGET(patch_jwt DEPENDS ${JWT_PATCHED_FILENAME}) # TODO: devise better strategy for clean up; usually the build folder is removed so the clean is not called ADD_CUSTOM_TARGET(clean_patch_jwt - COMMAND [ -f ${JWT_PATCHED_FILENAME} ] && cd jwt-cpp && git apply --reverse ../jwt-cpp.patch && rm ../${JWT_PATCHED_FILENAME} + COMMAND [ -f ${JWT_PATCHED_FILENAME} ] && cd jwt-cpp && patch -f -p1 -R < ../jwt-cpp.patch && rm ../${JWT_PATCHED_FILENAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )