From 0e6174a7f28c45faf711030697a6c32547336acd Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Fri, 23 Oct 2020 07:49:17 +0200 Subject: [PATCH] Use git apply instead of cherry-pick (#42) Signed-off-by: Miguel Company --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95239a2..a4d7945 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,8 @@ if(NOT foonathan_memory_FOUND) if(INSTALLER_PLATFORM) set(PATCH_COMMAND_STR PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.patch && sed -i -e "s/INSTALLER_PLATFORM/${INSTALLER_PLATFORM}/g" CMakeLists.txt) elseif(BUILD_MEMORY_TESTS) - set(PATCH_COMMAND_STR PATCH_COMMAND git cherry-pick 09b884c18abb314bfa678df27141a4dcad71c4ba) + # This could be removed whenever we change the GIT_TAG from c619113 to anything above 09b884c + set(PATCH_COMMAND_STR PATCH_COMMAND curl https://github.com/foonathan/memory/commit/09b884c18abb314bfa678df27141a4dcad71c4ba.diff | git apply -) endif() externalproject_add(foo_mem-ext