Skip to content
This repository was archived by the owner on Oct 6, 2020. It is now read-only.

Commit 406320d

Browse files
committed
Merge branch 'freetype-gl' of https://github.com/caseymcc/hunter into pkg.freetype-gl
2 parents ffc4384 + ee0d6a5 commit 406320d

68 files changed

Lines changed: 949 additions & 513 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cmake/configs/default.cmake

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ hunter_default_version(Android-SDK-Tools VERSION 25.2.5)
2727
hunter_default_version(Android-Support-Repository VERSION 47)
2828
hunter_default_version(AngelScript VERSION 2.30-p0)
2929
hunter_default_version(ArrayFire VERSION 3.3.1-p0)
30-
hunter_default_version(Assimp VERSION 5.0.0-07779a7a)
30+
hunter_default_version(Assimp VERSION 5.0.1-575ce61)
3131
hunter_default_version(Async++ VERSION 0.0.3-hunter)
3232
hunter_default_version(Avahi VERSION 0.6.31)
3333
hunter_default_version(BZip2 VERSION 1.0.8-p0)
@@ -56,7 +56,7 @@ hunter_default_version(CppNetlib VERSION 0.10.1-hunter-3)
5656
hunter_default_version(CppNetlibUri VERSION 1.0.5-hunter)
5757
hunter_default_version(CreateLaunchers VERSION 0.2.1)
5858
hunter_default_version(CsvParserCPlusPlus VERSION 1.0.1)
59-
hunter_default_version(Eigen VERSION 3.3.7)
59+
hunter_default_version(Eigen VERSION 3.3.8-b11f817)
6060
hunter_default_version(EnumGroup VERSION 0.0.1)
6161
hunter_default_version(Expat VERSION 2.2.9-p0)
6262
hunter_default_version(FLAC VERSION 1.3.3-p0)
@@ -116,7 +116,7 @@ hunter_default_version(PROJ4 VERSION 5.0.0)
116116
hunter_default_version(PhysUnits VERSION 1.1.0-p0)
117117
hunter_default_version(PocoCpp VERSION 1.10.1-p0)
118118
hunter_default_version(PostgreSQL VERSION 10.0.0)
119-
hunter_default_version(Protobuf VERSION 3.11.2-p0)
119+
hunter_default_version(Protobuf VERSION 3.12.4-p1)
120120

121121
string(COMPARE EQUAL "${CMAKE_SYSTEM_NAME}" "Linux" _is_linux)
122122
if(_is_linux OR MINGW)
@@ -167,6 +167,7 @@ hunter_default_version(ZMQPP VERSION 4.2.0-p0)
167167
hunter_default_version(ZeroMQ VERSION 4.2.3-p1)
168168
hunter_default_version(Zug VERSION 0.0.1-be20cae)
169169

170+
hunter_default_version(abseil VERSION 20200225.2)
170171
hunter_default_version(acf VERSION 0.1.14)
171172
hunter_default_version(actionlib VERSION 1.11.13-p0)
172173
hunter_default_version(aes VERSION 0.0.1-p1)
@@ -186,7 +187,7 @@ hunter_default_version(android_sdk_tools_packer VERSION 1.0.3)
186187
hunter_default_version(android_support_repository_packer VERSION 1.0.0)
187188
hunter_default_version(angles VERSION 1.9.11-p0)
188189
hunter_default_version(arabica VERSION 0.0.0-a202766-p0)
189-
hunter_default_version(asio VERSION 1.12.2-8d6df7b-p1)
190+
hunter_default_version(asio VERSION 1.17.0-p0)
190191
hunter_default_version(autobahn-cpp VERSION 0.2.0)
191192
hunter_default_version(autoutils VERSION 0.3.0)
192193
hunter_default_version(aws-c-common VERSION 0.2.1-p0)
@@ -261,7 +262,8 @@ hunter_default_version(flatbuffers VERSION 1.8.0-p1)
261262
hunter_default_version(flex VERSION 2.6.4)
262263
hunter_default_version(fmt VERSION 6.1.2)
263264
hunter_default_version(folly VERSION 2018.10.22.00-p4)
264-
hunter_default_version(freetype VERSION 2.9.1-p1)
265+
hunter_default_version(freetype VERSION 2.9.1-p4)
266+
hunter_default_version(freetype-gl VERSION 20.21.6-p0)
265267
hunter_default_version(frugally-deep VERSION 0.2.2-p0)
266268
hunter_default_version(gRPC VERSION 1.17.2-p0)
267269
hunter_default_version(gauze VERSION 0.7.1)
@@ -270,7 +272,7 @@ hunter_default_version(geos VERSION 3.4.2)
270272
hunter_default_version(getopt VERSION 1.0.0-p0)
271273
hunter_default_version(gflags VERSION 2.2.1)
272274
hunter_default_version(giflib VERSION 5.1.4-p1)
273-
hunter_default_version(gl4es VERSION 1.1.2-p0)
275+
hunter_default_version(gl4es VERSION 1.1.4-p1)
274276
hunter_default_version(glbinding VERSION 3.1.0-p0)
275277
hunter_default_version(glew VERSION 2.0.0-p1)
276278
hunter_default_version(glfw VERSION 3.3.0-f9923e9-p0)
@@ -304,7 +306,7 @@ hunter_default_version(inja VERSION 0.1.1)
304306
hunter_default_version(inputproto VERSION 2.3)
305307
hunter_default_version(intltool VERSION 0.51.0)
306308
hunter_default_version(intsizeof VERSION 2.0.2)
307-
hunter_default_version(intx VERSION 0.2.0)
309+
hunter_default_version(intx VERSION 0.5.0)
308310
hunter_default_version(ios_sim VERSION 3.1.1)
309311
hunter_default_version(ippicv VERSION 20151201)
310312
hunter_default_version(iroha-ed25519 VERSION 2.0.0)
@@ -332,7 +334,7 @@ hunter_default_version(libdaemon VERSION 0.14)
332334
hunter_default_version(libdill VERSION 1.6)
333335
hunter_default_version(libevhtp VERSION 1.2.16-p4)
334336
hunter_default_version(libffi VERSION 3.2.1)
335-
hunter_default_version(libigl VERSION 2.0.0-e33f534-p1)
337+
hunter_default_version(libigl VERSION 2.2.0)
336338
hunter_default_version(libjpeg-turbo VERSION 2.0.3-p0)
337339
hunter_default_version(libjson-rpc-cpp VERSION 0.7.0-p3)
338340
hunter_default_version(libmill VERSION 1.18)
@@ -342,7 +344,7 @@ hunter_default_version(librtmp VERSION 2.4.0-p0)
342344
hunter_default_version(libscrypt VERSION 1.21-p1)
343345
hunter_default_version(libsodium VERSION 1.0.16-p0)
344346
hunter_default_version(libunibreak VERSION 4.0)
345-
hunter_default_version(libusb VERSION 1.0.22)
347+
hunter_default_version(libusb VERSION 1.0.23)
346348
hunter_default_version(libuv VERSION 1.24.0-p1)
347349
hunter_default_version(libxdg-basedir VERSION 1.2.0)
348350
hunter_default_version(libxml2 VERSION 2.9.7-p0)
@@ -372,7 +374,7 @@ hunter_default_version(nanosvg VERSION 0.0.0-2b08dee-p0)
372374
hunter_default_version(ncnn VERSION 20180314-p2)
373375
hunter_default_version(ncursesw VERSION 6.1)
374376
hunter_default_version(nlohmann_fifo_map VERSION 0.0.0-0dfbf5d-p1)
375-
hunter_default_version(nlohmann_json VERSION 3.7.0)
377+
hunter_default_version(nlohmann_json VERSION 3.8.0)
376378
hunter_default_version(nng VERSION 1.1.1)
377379
hunter_default_version(nsync VERSION 1.14-p1)
378380
hunter_default_version(odb VERSION 2.4.0)
@@ -422,8 +424,8 @@ hunter_default_version(presentproto VERSION 1.0)
422424
hunter_default_version(prometheus-cpp VERSION 0.6.0-p2)
423425
hunter_default_version(protobuf-c VERSION 1.3.0-p1)
424426
hunter_default_version(pthread-stubs VERSION 0.4)
425-
hunter_default_version(pugixml VERSION 1.8.1)
426-
hunter_default_version(pybind11 VERSION 2.2.4)
427+
hunter_default_version(pugixml VERSION 1.10-p0)
428+
hunter_default_version(pybind11 VERSION 2.5.0)
427429
hunter_default_version(qhull VERSION 7.2.0-p1)
428430
hunter_default_version(quickjs VERSION 2020-04-12-p0)
429431
hunter_default_version(rabbitmq-c VERSION 0.10.0)
@@ -441,7 +443,7 @@ else()
441443
hunter_default_version(range-v3 VERSION 0.5.0)
442444
endif()
443445

444-
hunter_default_version(re2 VERSION 2017.11.01-p0)
446+
hunter_default_version(re2 VERSION 2020.08.01)
445447
hunter_default_version(readline VERSION 6.3)
446448
hunter_default_version(recastnavigation VERSION 1.4-p0)
447449
hunter_default_version(renderproto VERSION 0.11.1)
@@ -464,7 +466,7 @@ hunter_default_version(ros_std_msgs VERSION 0.5.12-p0)
464466
hunter_default_version(rosconsole VERSION 1.13.10-p0)
465467
hunter_default_version(roscpp_core VERSION 0.6.12-p0)
466468
hunter_default_version(rospack VERSION 2.5.3-p0)
467-
hunter_default_version(s3 VERSION 0.0.0-287e4be-p1)
469+
hunter_default_version(s3 VERSION 4.1.0-287e4be-p0)
468470
hunter_default_version(scelta VERSION 0.1.0-a0f4f70-p0)
469471
hunter_default_version(sds VERSION 2.0.0)
470472
hunter_default_version(sentencepiece VERSION 0.1.8-p1)
@@ -499,10 +501,12 @@ hunter_default_version(tcl VERSION core8.6.8)
499501
hunter_default_version(termcolor VERSION 1.0.0)
500502
hunter_default_version(tf VERSION 1.12.0-p0)
501503
hunter_default_version(tf2 VERSION 0.6.5-p0)
504+
hunter_default_version(theora VERSION 1.1.1-p0)
502505
hunter_default_version(thread-pool-cpp VERSION 1.1.0)
503506
hunter_default_version(thrift VERSION 0.12.0-p0)
504507
hunter_default_version(tiny-process-library VERSION 2.0.2-p0)
505508
hunter_default_version(tinydir VERSION 1.2-p0)
509+
hunter_default_version(tinyobjloader VERSION 2.0.0-rc6-bec38e3)
506510
hunter_default_version(tinyrefl VERSION 0.4.1-p0)
507511
hunter_default_version(tinyxml2 VERSION 6.2.0-p1)
508512
hunter_default_version(tmxparser VERSION 2.1.0-ab4125b-p1)
@@ -512,7 +516,7 @@ hunter_default_version(tommath VERSION 1.0.1-p0)
512516
hunter_default_version(tvm VERSION 0.5-a4bc50e-p0)
513517
hunter_default_version(type_safe VERSION 0.2.1-p2)
514518
hunter_default_version(units VERSION 2.3.1)
515-
hunter_default_version(utf8 VERSION 2.3.4-p1)
519+
hunter_default_version(utf8 VERSION 3.1.1)
516520
hunter_default_version(util_linux VERSION 2.30.1)
517521
hunter_default_version(uuid VERSION 1.0.3)
518522
hunter_default_version(v8 VERSION 7.4.98-p3)
@@ -524,6 +528,7 @@ hunter_default_version(wxWidgets VERSION 3.0.2)
524528
hunter_default_version(wyrm VERSION 0.1.0)
525529
hunter_default_version(x11 VERSION 1.6.7)
526530
hunter_default_version(x264 VERSION snapshot-20190513-2245)
531+
hunter_default_version(xatlas VERSION 0.0.0-4077f0e-p0)
527532
hunter_default_version(xau VERSION 1.0.9)
528533
hunter_default_version(xcb VERSION 1.13)
529534
hunter_default_version(xcb-proto VERSION 1.13)
@@ -547,6 +552,7 @@ hunter_default_version(xxf86vm VERSION 1.1.2)
547552
hunter_default_version(xxhash VERSION 0.6.5-p0)
548553
hunter_default_version(yaml-cpp VERSION 0.6.2-0f9a586-p1)
549554
hunter_default_version(zip VERSION 0.1.15)
555+
hunter_default_version(zlog VERSION 1.2.14)
550556
hunter_default_version(zookeeper VERSION 3.4.9-p2)
551557
hunter_default_version(zstd VERSION 1.4.5)
552558

cmake/projects/Assimp/hunter.cmake

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,28 @@ hunter_add_version(
5353
eb8cf84437f6cd4e8efbda5839655e1e1c347c27
5454
)
5555

56+
hunter_add_version(
57+
PACKAGE_NAME
58+
Assimp
59+
VERSION
60+
5.0.1-575ce61
61+
URL
62+
"https://github.com/assimp/assimp/archive/575ce6136d4941a45c6ba894947d0e79fe032aff.tar.gz"
63+
SHA1
64+
1c25da96497aede9070c2db4479c22e9dae8567f
65+
)
66+
5667
hunter_cmake_args(
5768
Assimp
5869
CMAKE_ARGS
70+
BUILD_SHARED_LIBS=OFF
5971
ASSIMP_BUILD_ASSIMP_TOOLS=OFF
6072
ASSIMP_BUILD_SAMPLES=OFF
6173
ASSIMP_BUILD_TESTS=OFF
6274
ASSIMP_ENABLE_BOOST_WORKAROUND=OFF
6375
ASSIMP_INSTALL_PDB=OFF
64-
IGNORE_GIT_HASH=ON
76+
ASSIMP_IGNORE_GIT_HASH=ON
77+
ASSIMP_HUNTER_ENABLED=ON
6578
)
6679

6780
hunter_pick_scheme(DEFAULT url_sha1_cmake)

cmake/projects/Eigen/hunter.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@ include(hunter_cacheable)
1313
hunter_cacheable(Eigen)
1414

1515
# List of versions here...
16+
hunter_add_version(
17+
PACKAGE_NAME
18+
Eigen
19+
VERSION
20+
"3.3.8-b11f817"
21+
URL
22+
"https://gitlab.com/libeigen/eigen/-/archive/b11f817bcff04276f3024d6780f56a137968b81a/eigen-b11f817bcff04276f3024d6780f56a137968b81a.tar.gz"
23+
SHA1
24+
2b57944e2d36cc210d142f1b8aa8f1d1d491b655
25+
)
26+
1627
hunter_add_version(
1728
PACKAGE_NAME
1829
Eigen

cmake/projects/Protobuf/hunter.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,17 @@ hunter_add_version(
149149
490beb456fb6934bd4d9f6012c601f6724c2f757
150150
)
151151

152+
hunter_add_version(
153+
PACKAGE_NAME
154+
Protobuf
155+
VERSION
156+
"3.12.4-p1"
157+
URL
158+
"https://github.com/cpp-pm/protobuf/archive/v3.12.4-p1.tar.gz"
159+
SHA1
160+
01b62322e6d9d3271261882bbc7c1719f7179d9d
161+
)
162+
152163
string(
153164
COMPARE EQUAL "${CMAKE_SYSTEM_NAME}" "WindowsStore" _hunter_windows_store
154165
)

cmake/projects/abseil/hunter.cmake

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Copyright (c) 2016-2020, Rahul Sheth, Ruslan Baratov
2+
# All rights reserved.
3+
4+
# !!! DO NOT PLACE HEADER GUARDS HERE !!!
5+
6+
include(hunter_add_version)
7+
include(hunter_cacheable)
8+
include(hunter_cmake_args)
9+
include(hunter_download)
10+
include(hunter_pick_scheme)
11+
12+
hunter_add_version(
13+
PACKAGE_NAME
14+
abseil
15+
VERSION
16+
20200225.2
17+
URL
18+
"https://github.com/abseil/abseil-cpp/archive/20200225.2.tar.gz"
19+
SHA1
20+
f8207455be29fa9b0fc80393f63df49a85212084
21+
)
22+
23+
hunter_cmake_args(
24+
abseil
25+
CMAKE_ARGS
26+
ABSL_ENABLE_INSTALL=ON
27+
ABSL_RUN_TESTS=OFF
28+
)
29+
30+
hunter_pick_scheme(DEFAULT url_sha1_cmake)
31+
hunter_cacheable(abseil)
32+
hunter_download(PACKAGE_NAME abseil)

cmake/projects/asio/hunter.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ hunter_add_version(
1919
35f9abb8abaac541f168e7cc547a256b2ca6e2dd
2020
)
2121

22+
hunter_add_version(
23+
PACKAGE_NAME
24+
asio
25+
VERSION
26+
1.17.0-p0
27+
URL
28+
"https://github.com/cpp-pm/asio/archive/v1.17.0-p0.tar.gz"
29+
SHA1
30+
21239ee00b2f765db4d3f2dcd9ee953c1650c3f1
31+
)
32+
2233
hunter_pick_scheme(DEFAULT url_sha1_cmake)
2334
hunter_cacheable(asio)
2435
hunter_download(PACKAGE_NAME asio)

cmake/projects/foo/hunter.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2016-2019, Ruslan Baratov
1+
# Copyright (c) 2016-2020, Rahul Sheth, Ruslan Baratov
22
# All rights reserved.
33

44
# !!! DO NOT PLACE HEADER GUARDS HERE !!!
@@ -14,7 +14,7 @@ hunter_add_version(
1414
VERSION
1515
1.0.0
1616
URL
17-
"https://github.com/hunter-packages/foo/archive/v1.0.0.tar.gz"
17+
"https://github.com/cpp-pm/foo/archive/v1.0.0.tar.gz"
1818
SHA1
1919
1111111111111111111111111111111111111111
2020
)
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# !!! DO NOT PLACE HEADER GUARDS HERE !!!
2+
3+
include(hunter_add_version)
4+
include(hunter_cacheable)
5+
include(hunter_cmake_args)
6+
include(hunter_download)
7+
include(hunter_pick_scheme)
8+
9+
hunter_add_version(
10+
PACKAGE_NAME
11+
freetype-gl
12+
VERSION
13+
"20.21.6-p0" #project has no releases so usinging date Y.M.D-patch
14+
URL
15+
"https://github.com/cpp-pm/freetype-gl/archive/v0.0.0-1a8c007-p0.tar.gz"
16+
SHA1
17+
923b6a4fad097beefa6aa6c759e7fa4010bf9214
18+
)
19+
20+
hunter_cmake_args(
21+
freetype-gl
22+
CMAKE_ARGS
23+
freetype-gl_USE_HUNTER=ON
24+
freetype-gl_BUILD_DEMOS=OFF
25+
freetype-gl_BUILD_TESTS=OFF
26+
freetype-gl_BUILD_APIDOC=OFF
27+
freetype-gl_BUILD_MAKEFONT=OFF
28+
)
29+
30+
hunter_pick_scheme(DEFAULT url_sha1_cmake)
31+
hunter_cacheable(freetype-gl)
32+
hunter_download(PACKAGE_NAME freetype-gl)

cmake/projects/freetype/hunter.cmake

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,28 @@ include(hunter_cmake_args)
88
include(hunter_download)
99
include(hunter_pick_scheme)
1010

11+
hunter_add_version(
12+
PACKAGE_NAME
13+
freetype
14+
VERSION
15+
"2.9.1-p4"
16+
URL
17+
"https://github.com/caseymcc/freetype/archive/v2.9.1-p4.tar.gz"
18+
SHA1
19+
1945836f31c9db23bbca21c119d17326d69b642b
20+
)
21+
22+
hunter_add_version(
23+
PACKAGE_NAME
24+
freetype
25+
VERSION
26+
"2.9.1-p3"
27+
URL
28+
"https://github.com/cpp-pm/freetype/archive/v2.9.1-p3.tar.gz"
29+
SHA1
30+
310198f66076d88da89428b6db04fc4fd8d19419
31+
)
32+
1133
hunter_add_version(
1234
PACKAGE_NAME
1335
freetype

cmake/projects/gl4es/hunter.cmake

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,28 @@ include(hunter_download)
44
include(hunter_cmake_args)
55
include(hunter_pick_scheme)
66

7+
hunter_add_version(
8+
PACKAGE_NAME
9+
gl4es
10+
VERSION
11+
1.1.4-p1
12+
URL
13+
"https://github.com/cpp-pm/gl4es/archive/v1.1.4-p1.tar.gz"
14+
SHA1
15+
5a3f0c3c966962171ff9c694a13b4a704654593c
16+
)
17+
18+
hunter_add_version(
19+
PACKAGE_NAME
20+
gl4es
21+
VERSION
22+
1.1.4-p0
23+
URL
24+
"https://github.com/cpp-pm/gl4es/archive/1.1.4-p0.tar.gz"
25+
SHA1
26+
fcb75a97d261bf7910a5bbfbd60a95a36a216295
27+
)
28+
729
hunter_add_version(
830
PACKAGE_NAME
931
gl4es

0 commit comments

Comments
 (0)