Skip to content

Commit b70ac23

Browse files
PaxxiRechi
Paxxi
authored and
Rechi
committed
Change patch to use git apply
1 parent 50f1dd9 commit b70ac23

File tree

2 files changed

+44
-49
lines changed

2 files changed

+44
-49
lines changed

‎CMakeLists.txt‎

Lines changed: 43 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,18 @@ message(STATUS " KODI_PATH: ${KODI_PATH}")
3838
message(STATUS " ADDITIONAL_ARGS: ${ADDITIONAL_ARGS}")
3939
message(STATUS " INSTALL_PREFIX: ${INSTALL_PREFIX}")
4040

41-
find_program(PATCH patch)
42-
include(FindPackageHandleStandardArgs)
43-
find_package_handle_standard_args(PATCH REQUIRED_VARS PATCH)
44-
if(NOT ${PATCH_FOUND})
45-
message(FATAL_ERROR "patch not found")
46-
endif()
41+
find_package(Git REQUIRED)
42+
set(PATCH_APPLY ${GIT_EXECUTABLE} apply --inaccurate-eof)
4743

4844
include(ExternalProject)
4945

50-
5146
# dependencies required by others
5247

5348
ExternalProject_Add(bzip2
5449
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
5550
URL http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
5651
URL_HASH SHA256=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
57-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
52+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
5853
CMAKE_ARGS
5954
${ADDITIONAL_ARGS}
6055
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -64,7 +59,7 @@ ExternalProject_Add(expat
6459
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
6560
URL https://sourceforge.net/projects/expat/files/expat/2.2.0/expat-2.2.0.tar.bz2
6661
URL_HASH SHA256=d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff
67-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
62+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
6863
CMAKE_ARGS
6964
${ADDITIONAL_ARGS}
7065
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -79,7 +74,7 @@ ExternalProject_Add(libiconv
7974
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
8075
URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz
8176
URL_HASH SHA256=ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
82-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
77+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
8378
CMAKE_ARGS
8479
${ADDITIONAL_ARGS}
8580
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -89,7 +84,7 @@ ExternalProject_Add(openssl
8984
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
9085
URL https://www.openssl.org/source/openssl-1.0.2k.tar.gz
9186
URL_HASH SHA256=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
92-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
87+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
9388
INSTALL_COMMAND
9489
CMAKE_ARGS
9590
${ADDITIONAL_ARGS}
@@ -100,7 +95,7 @@ ExternalProject_Add(zlib
10095
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
10196
URL http://zlib.net/zlib-1.2.11.tar.gz
10297
URL_HASH SHA256=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
103-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
98+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
10499
CMAKE_ARGS
105100
${ADDITIONAL_ARGS}
106101
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -119,7 +114,7 @@ ExternalProject_Add(cpluff
119114
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
120115
URL http://www.c-pluff.org/downloads/cpluff-0.1.3.tar.gz
121116
URL_HASH SHA256=bae2ff7c3df4cf3cd9b0f32936ebe88c61d7da7c60a33b7cef4b98f8fca9c73c
122-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
117+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
123118
CMAKE_ARGS
124119
${ADDITIONAL_ARGS}
125120
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -131,7 +126,7 @@ ExternalProject_Add(crossguid
131126
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
132127
URL https://github.com/graeme-hill/crossguid/archive/fef89a4.tar.gz
133128
URL_HASH SHA256=271f0cc8ca79f4e56398439c5d6e59dcc47b34f27b54ecda2491ef901e5bd65d
134-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
129+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
135130
CMAKE_ARGS
136131
${ADDITIONAL_ARGS}
137132
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -143,7 +138,7 @@ ExternalProject_Add(easyhook
143138
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
144139
URL https://github.com/EasyHook/EasyHook/archive/v2.7.6035.0.tar.gz
145140
URL_HASH SHA256=db5dafbc08ccd181dc8f2e11a7adf63b3e90b6bea974c326ce15fc4ba70d96b4
146-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
141+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
147142
CMAKE_ARGS
148143
${ADDITIONAL_ARGS}
149144
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -165,7 +160,7 @@ ExternalProject_Add(freetype
165160
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
166161
URL https://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.gz
167162
URL_HASH SHA256=162ef25aa64480b1189cdb261228e6c5c44f212aac4b4621e28cf2157efb59f5
168-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
163+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
169164
CMAKE_ARGS
170165
${ADDITIONAL_ARGS}
171166
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -176,7 +171,7 @@ ExternalProject_Add(libcdio
176171
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
177172
URL https://ftp.gnu.org/gnu/libcdio/libcdio-0.94.tar.gz
178173
URL_HASH SHA256=96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a
179-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
174+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
180175
CMAKE_ARGS
181176
${ADDITIONAL_ARGS}
182177
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -187,7 +182,7 @@ ExternalProject_Add(libfribidi
187182
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
188183
URL http://fribidi.org/download/fribidi-0.19.7.tar.bz2
189184
URL_HASH SHA256=08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e
190-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
185+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
191186
CMAKE_ARGS
192187
${ADDITIONAL_ARGS}
193188
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -198,7 +193,7 @@ ExternalProject_Add(libyajl
198193
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
199194
URL https://github.com/lloyd/yajl/archive/2.1.0.tar.gz
200195
URL_HASH SHA256=3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a
201-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
196+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
202197
CMAKE_ARGS
203198
${ADDITIONAL_ARGS}
204199
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -211,7 +206,7 @@ ExternalProject_Add(lzo2
211206
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
212207
URL http://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz
213208
URL_HASH SHA256=f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c
214-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
209+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
215210
CMAKE_ARGS
216211
${ADDITIONAL_ARGS}
217212
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -221,7 +216,7 @@ ExternalProject_Add(pcre
221216
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
222217
URL https://ftp.pcre.org/pub/pcre/pcre-8.40.tar.gz
223218
URL_HASH SHA256=1d75ce90ea3f81ee080cdc04e68c9c25a9fb984861a0618be7bbf676b18eda3e
224-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
219+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
225220
CMAKE_ARGS
226221
${ADDITIONAL_ARGS}
227222
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -241,7 +236,7 @@ ExternalProject_Add(sqlite
241236
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
242237
URL http://sqlite.com/2017/sqlite-amalgamation-3170000.zip
243238
URL_HASH SHA256=ad3d5152f7dd09117654736b416e656c46de83b251e71a14b9a2de3aab29cfb2
244-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
239+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
245240
CMAKE_ARGS
246241
${ADDITIONAL_ARGS}
247242
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -252,7 +247,7 @@ ExternalProject_Add(taglib
252247
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
253248
URL http://taglib.org/releases/taglib-1.11.1.tar.gz
254249
URL_HASH SHA256=b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b
255-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
250+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
256251
CMAKE_ARGS
257252
${ADDITIONAL_ARGS}
258253
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -262,7 +257,7 @@ ExternalProject_Add(tinyxml
262257
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
263258
URL https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz
264259
URL_HASH SHA256=15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593
265-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
260+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
266261
CMAKE_ARGS
267262
${ADDITIONAL_ARGS}
268263
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -304,7 +299,7 @@ ExternalProject_Add(libass
304299
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
305300
URL https://github.com/libass/libass/releases/download/0.13.6/libass-0.13.6.tar.gz
306301
URL_HASH SHA256=62070da83b2139c1875c9db65ece37f80f955097227b7d46ade680221efdff4b
307-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
302+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
308303
INSTALL_COMMAND
309304
CMAKE_ARGS
310305
${ADDITIONAL_ARGS}
@@ -318,7 +313,7 @@ ExternalProject_Add(curl
318313
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
319314
URL https://curl.haxx.se/download/curl-7.52.1.tar.gz
320315
URL_HASH SHA256=a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae
321-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
316+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
322317
CMAKE_ARGS
323318
${ADDITIONAL_ARGS}
324319
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -342,7 +337,7 @@ ExternalProject_Add(dnssd
342337
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
343338
URL https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-765.50.9.tar.gz
344339
URL_HASH SHA256=de61dd0034357aa50c60806726fb1f70fa8e953ff9cb62eccfb73efad10dba0a
345-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
340+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
346341
CMAKE_ARGS
347342
${ADDITIONAL_ARGS}
348343
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -353,7 +348,7 @@ ExternalProject_Add(lcms2
353348
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
354349
URL https://sourceforge.net/projects/lcms/files/lcms/2.8/lcms2-2.8.tar.gz
355350
URL_HASH SHA256=66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
356-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff COMMAND
351+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff COMMAND
357352
CMAKE_ARGS
358353
${ADDITIONAL_ARGS}
359354
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -374,7 +369,7 @@ ExternalProject_Add(libcec
374369
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
375370
URL https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.2.tar.gz
376371
URL_HASH SHA256=b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27
377-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
372+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
378373
CMAKE_ARGS
379374
${ADDITIONAL_ARGS}
380375
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -385,7 +380,7 @@ ExternalProject_Add(libgpg-error
385380
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
386381
URL https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
387382
URL_HASH SHA256=4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
388-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
383+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
389384
CMAKE_ARGS
390385
${ADDITIONAL_ARGS}
391386
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -396,7 +391,7 @@ ExternalProject_Add(libgcrypt
396391
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
397392
URL https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.6.tar.bz2
398393
URL_HASH SHA256=626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc
399-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
394+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
400395
CMAKE_ARGS
401396
${ADDITIONAL_ARGS}
402397
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -407,7 +402,7 @@ ExternalProject_Add(winflexbison
407402
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
408403
URL https://sourceforge.net/projects/winflexbison/files/win_flex_bison-2.5.9.zip
409404
URL_HASH SHA256=aeb05493db39c03579412a54872334dcc54a342d856a755998074008eee4ba25
410-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
405+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
411406
CMAKE_ARGS
412407
${ADDITIONAL_ARGS}
413408
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -419,7 +414,7 @@ ExternalProject_Add(libaacs
419414
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
420415
URL ftp://ftp.videolan.org/pub/videolan/libaacs/0.9.0/libaacs-0.9.0.tar.bz2
421416
URL_HASH SHA512=b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6
422-
PATCH_COMMAND ${CMAKE_SOURCE_DIR}/patch.exe -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
417+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
423418
CMAKE_ARGS
424419
${ADDITIONAL_ARGS}
425420
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -432,7 +427,7 @@ ExternalProject_Add(libbdplus
432427
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
433428
URL https://github.com/ace20022/libbdplus/archive/45c76dd.tar.gz
434429
URL_HASH SHA256=843081a7fb05567f5d0ca8bbe69996f3cf18bf94e76871519aa8f2e598210f7f
435-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
430+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
436431
CMAKE_ARGS
437432
${ADDITIONAL_ARGS}
438433
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -443,7 +438,7 @@ ExternalProject_Add(libmicrohttpd
443438
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
444439
URL https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.55.tar.gz
445440
URL_HASH SHA256=0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8
446-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
441+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
447442
CMAKE_ARGS
448443
${ADDITIONAL_ARGS}
449444
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -453,7 +448,7 @@ ExternalProject_Add(libnfs
453448
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
454449
URL https://github.com/sahlberg/libnfs/archive/libnfs-1.11.0.tar.gz
455450
URL_HASH SHA256=fc2e45df14d8714ccd07dc2bbe919e45a2e36318bae7f045cbbb883a7854640f
456-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
451+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
457452
CMAKE_ARGS
458453
${ADDITIONAL_ARGS}
459454
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -465,7 +460,7 @@ ExternalProject_Add(libxml2
465460
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
466461
URL ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz
467462
URL_HASH SHA256=ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c
468-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff COMMAND
463+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff COMMAND
469464
CMAKE_ARGS
470465
${ADDITIONAL_ARGS}
471466
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -478,7 +473,7 @@ ExternalProject_Add(libxslt
478473
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
479474
URL ftp://xmlsoft.org/libxml2/libxslt-1.1.29.tar.gz
480475
URL_HASH SHA256=b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce
481-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff COMMAND
476+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff COMMAND
482477
CMAKE_ARGS
483478
${ADDITIONAL_ARGS}
484479
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -491,7 +486,7 @@ ExternalProject_Add(libplist
491486
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
492487
URL http://www.libimobiledevice.org/downloads/libplist-1.12.tar.bz2
493488
URL_HASH SHA256=0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be
494-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
489+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
495490
CMAKE_ARGS
496491
${ADDITIONAL_ARGS}
497492
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -504,7 +499,7 @@ ExternalProject_Add(libwebp
504499
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
505500
URL https://github.com/webmproject/libwebp/archive/v0.6.0.tar.gz
506501
URL_HASH SHA256=e1bd8b81098b8094edba0f161baf89f9fb1492e3fca19cf1d28eff4b88518702
507-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
502+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
508503
CMAKE_ARGS
509504
${ADDITIONAL_ARGS}
510505
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -514,7 +509,7 @@ ExternalProject_Add(mysql-connector-c
514509
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
515510
URL https://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-6.1.9-src.tar.gz
516511
URL_HASH SHA256=4e808704443365ad5b649673d03eca8fbebc0a4da9f1f96616c6bd1b1901ab2b
517-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
512+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
518513
CMAKE_ARGS
519514
${ADDITIONAL_ARGS}
520515
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -530,8 +525,8 @@ ExternalProject_Add(python
530525
URL https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz
531526
URL_HASH SHA256=a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1
532527
PATCH_COMMAND
533-
COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/python-cmake-buildsystem-b348a50.diff
534-
COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
528+
COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/python-cmake-buildsystem-b348a50.diff
529+
COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
535530
CMAKE_ARGS
536531
${ADDITIONAL_ARGS}
537532
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -549,7 +544,7 @@ ExternalProject_Add(libjpeg-turbo
549544
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
550545
URL https://sourceforge.net/projects/libjpeg-turbo/files/1.5.2/libjpeg-turbo-1.5.2.tar.gz
551546
URL_HASH SHA256=9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528
552-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
547+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
553548
CMAKE_ARGS
554549
${ADDITIONAL_ARGS}
555550
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -564,7 +559,7 @@ ExternalProject_Add(pillow
564559
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
565560
URL https://pypi.python.org/packages/55/aa/f7f983fb72710a9daa4b3374b7c160091d3f94f5c09221f9336ade9027f3/Pillow-4.2.1.tar.gz
566561
URL_HASH SHA256=c724f65870e545316f9e82e4c6d608ab5aa9dd82d5185e5b2e72119378740073
567-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
562+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
568563
CMAKE_ARGS
569564
${ADDITIONAL_ARGS}
570565
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -577,7 +572,7 @@ ExternalProject_Add(pycryptodome
577572
URL https://pypi.python.org/packages/2b/9b/aaa940ab8affd66eed043d69332dc607cddd68f9e399d93dcdfc8149fb21/pycryptodome-3.4.7.tar.gz
578573
URL_HASH SHA256=18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7
579574
PATCH_COMMAND
580-
COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
575+
COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
581576
CMAKE_ARGS
582577
${ADDITIONAL_ARGS}
583578
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -591,7 +586,7 @@ ExternalProject_Add(shairplay
591586
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
592587
URL https://github.com/juhovh/shairplay/archive/ce80e00.tar.gz
593588
URL_HASH SHA256=49ac0e0470ec6367f720c7b79a09165138f57b60f5949a2d9c38be5823d13294
594-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
589+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
595590
CMAKE_ARGS
596591
${ADDITIONAL_ARGS}
597592
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -603,7 +598,7 @@ ExternalProject_Add(libbluray
603598
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
604599
URL ftp://ftp.videolan.org/pub/videolan/libbluray/1.0.1/libbluray-1.0.1.tar.bz2
605600
URL_HASH SHA512=798d38cc95af87599af5838e5c288f2536a73b33191db8ff3774cf7eb5b835006bea83693f016d47dff551001b98527d8b1f14051f673fb3b28073b820e325d7
606-
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
601+
PATCH_COMMAND ${PATCH_APPLY} ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
607602
CMAKE_ARGS
608603
${ADDITIONAL_ARGS}
609604
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}

0 commit comments

Comments
 (0)