Skip to content

Commit

Permalink
Merge pull request #2264 from elBoberido/iox-2011-apply-cpptoml-patch…
Browse files Browse the repository at this point in the history
…-only-if-not-yet-applied-take-2-releaes-2-0

iox-#2011 Use cmake mechanism to suppress the output of 'git apply'
  • Loading branch information
elBoberido authored Apr 17, 2024
2 parents ce3475d + bb2a7f8 commit 54f5447
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion iceoryx_posh/cmake/cpptoml/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ if(DEFINED CMAKE_TOOLCHAIN_FILE)
endif()

execute_process(
COMMAND git apply -R -p1 --ignore-space-change --whitespace=nowarn --quiet --check
COMMAND git apply -R -p1 --ignore-space-change --whitespace=nowarn --check
INPUT_FILE "${CMAKE_CURRENT_LIST_DIR}/0001-cpptoml-cmake-version.patch"
WORKING_DIRECTORY "${SOURCE_DIR}"
OUTPUT_QUIET
ERROR_QUIET
RESULT_VARIABLE result)
if(result)
message(STATUS "Applying patch for minimal cmake version to cpptoml")
Expand Down

0 comments on commit 54f5447

Please sign in to comment.