Skip to content

Commit

Permalink
Use git apply instead of cherry-pick (#42)
Browse files Browse the repository at this point in the history
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
  • Loading branch information
MiguelCompany authored Oct 23, 2020
1 parent d034034 commit 0e6174a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0e6174a

Please sign in to comment.