Skip to content

Commit f00cfe0

Browse files
authored
Merge pull request #2263 from elBoberido/iox-2011-apply-cpptoml-patch-only-if-not-yet-applied-take-2
iox-#2011 Use cmake mechanism to suppress the output of 'git apply'
2 parents 76854de + b99ac0c commit f00cfe0

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

iceoryx_posh/cmake/cpptoml/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,11 @@ if(DEFINED CMAKE_TOOLCHAIN_FILE)
7373
endif()
7474

7575
execute_process(
76-
COMMAND git apply -R -p1 --ignore-space-change --whitespace=nowarn --quiet --check
76+
COMMAND git apply -R -p1 --ignore-space-change --whitespace=nowarn --check
7777
INPUT_FILE "${CMAKE_CURRENT_LIST_DIR}/0001-cpptoml-cmake-version.patch"
7878
WORKING_DIRECTORY "${SOURCE_DIR}"
79+
OUTPUT_QUIET
80+
ERROR_QUIET
7981
RESULT_VARIABLE result)
8082
if(result)
8183
message(STATUS "Applying patch for minimal cmake version to cpptoml")

0 commit comments

Comments
 (0)