Skip to content

Commit e306403

Browse files
npmillerlukaszstolarczuk
authored andcommitted
Fix hwloc patch application on windows
Windows `cmd.exe` doesn't have a `true` command, `(exit 0)` will do the same thing but it will work on both linux and windows. This issue only shows up on Windows and not on a first build, since when building the first time the patch applies cleanly so the `||` branch is not taken, but then when rebuilding the patch doens't apply and the command errors out in the `||` branch.
1 parent 99c9bfc commit e306403

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ elseif(WINDOWS AND NOT UMF_DISABLE_HWLOC)
136136
apply
137137
${PROJECT_SOURCE_DIR}/cmake/fix_coverity_issues.patch
138138
||
139-
true)
139+
(exit 0))
140140

141141
message(STATUS "Will fetch hwloc from ${UMF_HWLOC_REPO}")
142142

@@ -167,7 +167,7 @@ elseif(NOT UMF_DISABLE_HWLOC)
167167
apply
168168
${PROJECT_SOURCE_DIR}/cmake/fix_coverity_issues.patch
169169
||
170-
true)
170+
(exit 0))
171171

172172
message(STATUS "Will fetch hwloc from ${UMF_HWLOC_REPO}")
173173

0 commit comments

Comments
 (0)