rugged 1.3.2.3 → 1.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ext/rugged/extconf.rb +1 -1
- data/ext/rugged/rugged_config.c +7 -2
- data/ext/rugged/rugged_remote.c +17 -0
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +103 -276
- data/vendor/libgit2/COPYING +36 -19
- data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
- data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
- data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
- data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
- data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
- data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
- data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
- data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
- data/vendor/libgit2/cmake/FindPCRE.cmake +13 -13
- data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
- data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
- data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
- data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
- data/vendor/libgit2/cmake/Findfutimens.cmake +8 -8
- data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
- data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
- data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -100
- data/vendor/libgit2/cmake/SelectHashes.cmake +39 -49
- data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
- data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
- data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
- data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +31 -31
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +1 -1
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +288 -975
- data/vendor/libgit2/deps/zlib/crc32.h +436 -9441
- data/vendor/libgit2/deps/zlib/deflate.c +31 -83
- data/vendor/libgit2/deps/zlib/deflate.h +15 -12
- data/vendor/libgit2/deps/zlib/gzguts.h +2 -3
- data/vendor/libgit2/deps/zlib/infback.c +1 -2
- data/vendor/libgit2/deps/zlib/inffast.c +14 -14
- data/vendor/libgit2/deps/zlib/inflate.c +8 -39
- data/vendor/libgit2/deps/zlib/inflate.h +2 -3
- data/vendor/libgit2/deps/zlib/inftrees.c +3 -3
- data/vendor/libgit2/deps/zlib/trees.c +48 -27
- data/vendor/libgit2/deps/zlib/zlib.h +100 -126
- data/vendor/libgit2/deps/zlib/zutil.c +2 -2
- data/vendor/libgit2/deps/zlib/zutil.h +9 -12
- data/vendor/libgit2/include/git2/apply.h +16 -2
- data/vendor/libgit2/include/git2/attr.h +11 -2
- data/vendor/libgit2/include/git2/blame.h +4 -1
- data/vendor/libgit2/include/git2/blob.h +14 -1
- data/vendor/libgit2/include/git2/branch.h +2 -0
- data/vendor/libgit2/include/git2/buffer.h +18 -78
- data/vendor/libgit2/include/git2/cert.h +2 -2
- data/vendor/libgit2/include/git2/checkout.h +5 -2
- data/vendor/libgit2/include/git2/clone.h +3 -3
- data/vendor/libgit2/include/git2/commit.h +2 -0
- data/vendor/libgit2/include/git2/common.h +5 -12
- data/vendor/libgit2/include/git2/config.h +19 -3
- data/vendor/libgit2/include/git2/credential.h +2 -1
- data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
- data/vendor/libgit2/include/git2/deprecated.h +1 -1
- data/vendor/libgit2/include/git2/describe.h +7 -2
- data/vendor/libgit2/include/git2/diff.h +17 -9
- data/vendor/libgit2/include/git2/email.h +1 -1
- data/vendor/libgit2/include/git2/errors.h +1 -2
- data/vendor/libgit2/include/git2/filter.h +7 -2
- data/vendor/libgit2/include/git2/graph.h +1 -0
- data/vendor/libgit2/include/git2/ignore.h +1 -1
- data/vendor/libgit2/include/git2/index.h +11 -5
- data/vendor/libgit2/include/git2/indexer.h +19 -0
- data/vendor/libgit2/include/git2/merge.h +23 -3
- data/vendor/libgit2/include/git2/message.h +2 -0
- data/vendor/libgit2/include/git2/object.h +23 -0
- data/vendor/libgit2/include/git2/odb.h +37 -7
- data/vendor/libgit2/include/git2/odb_backend.h +1 -1
- data/vendor/libgit2/include/git2/pack.h +24 -8
- data/vendor/libgit2/include/git2/patch.h +8 -0
- data/vendor/libgit2/include/git2/pathspec.h +1 -1
- data/vendor/libgit2/include/git2/proxy.h +1 -1
- data/vendor/libgit2/include/git2/rebase.h +9 -1
- data/vendor/libgit2/include/git2/refdb.h +3 -0
- data/vendor/libgit2/include/git2/reflog.h +1 -1
- data/vendor/libgit2/include/git2/refs.h +2 -2
- data/vendor/libgit2/include/git2/remote.h +184 -37
- data/vendor/libgit2/include/git2/repository.h +14 -9
- data/vendor/libgit2/include/git2/reset.h +2 -2
- data/vendor/libgit2/include/git2/revparse.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +4 -1
- data/vendor/libgit2/include/git2/signature.h +1 -1
- data/vendor/libgit2/include/git2/stash.h +3 -3
- data/vendor/libgit2/include/git2/status.h +9 -3
- data/vendor/libgit2/include/git2/submodule.h +7 -2
- data/vendor/libgit2/include/git2/sys/commit_graph.h +1 -1
- data/vendor/libgit2/include/git2/sys/odb_backend.h +2 -5
- data/vendor/libgit2/include/git2/sys/remote.h +31 -0
- data/vendor/libgit2/include/git2/sys/stream.h +1 -1
- data/vendor/libgit2/include/git2/sys/transport.h +25 -34
- data/vendor/libgit2/include/git2/tag.h +1 -0
- data/vendor/libgit2/include/git2/tree.h +4 -3
- data/vendor/libgit2/include/git2/types.h +7 -7
- data/vendor/libgit2/include/git2/version.h +3 -3
- data/vendor/libgit2/include/git2/worktree.h +12 -2
- data/vendor/libgit2/src/CMakeLists.txt +189 -315
- data/vendor/libgit2/src/annotated_commit.h +1 -1
- data/vendor/libgit2/src/apply.c +18 -18
- data/vendor/libgit2/src/apply.h +2 -2
- data/vendor/libgit2/src/attr.c +18 -18
- data/vendor/libgit2/src/attr_file.c +17 -17
- data/vendor/libgit2/src/attr_file.h +4 -4
- data/vendor/libgit2/src/attrcache.c +17 -12
- data/vendor/libgit2/src/blame_git.c +1 -1
- data/vendor/libgit2/src/blob.c +33 -26
- data/vendor/libgit2/src/blob.h +1 -1
- data/vendor/libgit2/src/branch.c +150 -109
- data/vendor/libgit2/src/branch.h +15 -3
- data/vendor/libgit2/src/buf.c +126 -0
- data/vendor/libgit2/src/buf.h +50 -0
- data/vendor/libgit2/src/cc-compat.h +1 -1
- data/vendor/libgit2/src/checkout.c +74 -68
- data/vendor/libgit2/src/cherrypick.c +10 -10
- data/vendor/libgit2/src/clone.c +66 -66
- data/vendor/libgit2/src/commit.c +128 -58
- data/vendor/libgit2/src/commit.h +24 -1
- data/vendor/libgit2/src/commit_graph.c +68 -53
- data/vendor/libgit2/src/commit_graph.h +10 -3
- data/vendor/libgit2/src/commit_list.c +2 -3
- data/vendor/libgit2/src/common.h +10 -3
- data/vendor/libgit2/src/config.c +99 -77
- data/vendor/libgit2/src/config.h +15 -2
- data/vendor/libgit2/src/config_file.c +103 -91
- data/vendor/libgit2/src/config_mem.c +9 -9
- data/vendor/libgit2/src/config_parse.c +27 -23
- data/vendor/libgit2/src/crlf.c +24 -21
- data/vendor/libgit2/src/date.c +10 -17
- data/vendor/libgit2/src/date.h +33 -0
- data/vendor/libgit2/src/describe.c +27 -19
- data/vendor/libgit2/src/diff.c +25 -8
- data/vendor/libgit2/src/diff.h +2 -4
- data/vendor/libgit2/src/diff_driver.c +34 -36
- data/vendor/libgit2/src/diff_driver.h +3 -3
- data/vendor/libgit2/src/diff_file.c +29 -20
- data/vendor/libgit2/src/diff_generate.c +30 -6
- data/vendor/libgit2/src/diff_generate.h +5 -3
- data/vendor/libgit2/src/diff_print.c +102 -95
- data/vendor/libgit2/src/diff_stats.c +40 -29
- data/vendor/libgit2/src/{message.h → diff_stats.h} +7 -6
- data/vendor/libgit2/src/diff_tform.c +9 -8
- data/vendor/libgit2/src/diff_xdiff.c +3 -8
- data/vendor/libgit2/src/email.c +54 -38
- data/vendor/libgit2/src/email.h +1 -1
- data/vendor/libgit2/src/errors.c +18 -18
- data/vendor/libgit2/src/features.h.in +6 -1
- data/vendor/libgit2/src/fetch.c +69 -24
- data/vendor/libgit2/src/fetch.h +1 -1
- data/vendor/libgit2/src/fetchhead.c +19 -19
- data/vendor/libgit2/src/filebuf.c +28 -28
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +96 -52
- data/vendor/libgit2/src/filter.h +26 -5
- data/vendor/libgit2/src/fs_path.c +1912 -0
- data/vendor/libgit2/src/fs_path.h +752 -0
- data/vendor/libgit2/src/futils.c +91 -85
- data/vendor/libgit2/src/futils.h +26 -14
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +2 -2
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +2 -2
- data/vendor/libgit2/src/hash/sha1/generic.c +2 -2
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +2 -2
- data/vendor/libgit2/src/hash/sha1/openssl.c +2 -2
- data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +1 -1
- data/vendor/libgit2/src/hash/sha1/win32.c +6 -6
- data/vendor/libgit2/src/hash/sha1.h +3 -1
- data/vendor/libgit2/src/hash.c +67 -35
- data/vendor/libgit2/src/hash.h +12 -12
- data/vendor/libgit2/src/ident.c +18 -18
- data/vendor/libgit2/src/ignore.c +35 -34
- data/vendor/libgit2/src/ignore.h +2 -2
- data/vendor/libgit2/src/index.c +79 -80
- data/vendor/libgit2/src/index.h +6 -3
- data/vendor/libgit2/src/indexer.c +75 -57
- data/vendor/libgit2/src/iterator.c +64 -56
- data/vendor/libgit2/src/iterator.h +5 -5
- data/vendor/libgit2/src/khash.h +1 -1
- data/vendor/libgit2/src/libgit2.c +22 -19
- data/vendor/libgit2/src/mailmap.c +38 -36
- data/vendor/libgit2/src/merge.c +27 -27
- data/vendor/libgit2/src/merge.h +1 -14
- data/vendor/libgit2/src/merge_driver.c +2 -2
- data/vendor/libgit2/src/merge_file.c +13 -3
- data/vendor/libgit2/src/message.c +21 -10
- data/vendor/libgit2/src/midx.c +83 -66
- data/vendor/libgit2/src/midx.h +3 -3
- data/vendor/libgit2/src/mwindow.c +1 -1
- data/vendor/libgit2/src/net.c +278 -68
- data/vendor/libgit2/src/net.h +10 -3
- data/vendor/libgit2/src/netops.c +1 -1
- data/vendor/libgit2/src/netops.h +1 -1
- data/vendor/libgit2/src/notes.c +20 -29
- data/vendor/libgit2/src/object.c +49 -9
- data/vendor/libgit2/src/object.h +1 -1
- data/vendor/libgit2/src/odb.c +35 -32
- data/vendor/libgit2/src/odb.h +1 -1
- data/vendor/libgit2/src/odb_loose.c +68 -68
- data/vendor/libgit2/src/odb_mempack.c +18 -5
- data/vendor/libgit2/src/odb_pack.c +43 -43
- data/vendor/libgit2/src/oid.c +11 -4
- data/vendor/libgit2/src/oid.h +15 -0
- data/vendor/libgit2/src/pack-objects.c +41 -26
- data/vendor/libgit2/src/pack-objects.h +11 -6
- data/vendor/libgit2/src/pack.c +10 -10
- data/vendor/libgit2/src/patch.c +3 -3
- data/vendor/libgit2/src/patch.h +1 -0
- data/vendor/libgit2/src/patch_generate.c +27 -11
- data/vendor/libgit2/src/patch_generate.h +5 -5
- data/vendor/libgit2/src/patch_parse.c +24 -24
- data/vendor/libgit2/src/path.c +76 -1951
- data/vendor/libgit2/src/path.h +34 -741
- data/vendor/libgit2/src/pathspec.c +6 -6
- data/vendor/libgit2/src/pathspec.h +2 -2
- data/vendor/libgit2/src/posix.c +3 -3
- data/vendor/libgit2/src/posix.h +1 -0
- data/vendor/libgit2/src/pqueue.h +1 -1
- data/vendor/libgit2/src/proxy.c +4 -1
- data/vendor/libgit2/src/proxy.h +1 -1
- data/vendor/libgit2/src/push.c +30 -35
- data/vendor/libgit2/src/push.h +4 -16
- data/vendor/libgit2/src/rand.c +226 -0
- data/vendor/libgit2/src/rand.h +37 -0
- data/vendor/libgit2/src/reader.c +8 -8
- data/vendor/libgit2/src/reader.h +2 -2
- data/vendor/libgit2/src/rebase.c +89 -88
- data/vendor/libgit2/src/refdb_fs.c +447 -173
- data/vendor/libgit2/src/refs.c +32 -32
- data/vendor/libgit2/src/refs.h +2 -2
- data/vendor/libgit2/src/refspec.c +32 -37
- data/vendor/libgit2/src/refspec.h +5 -2
- data/vendor/libgit2/src/regexp.c +1 -1
- data/vendor/libgit2/src/remote.c +713 -419
- data/vendor/libgit2/src/remote.h +15 -10
- data/vendor/libgit2/src/repository.c +350 -467
- data/vendor/libgit2/src/repository.h +11 -10
- data/vendor/libgit2/src/reset.c +8 -5
- data/vendor/libgit2/src/revert.c +10 -10
- data/vendor/libgit2/src/revparse.c +48 -35
- data/vendor/libgit2/src/revwalk.c +7 -7
- data/vendor/libgit2/src/signature.c +12 -6
- data/vendor/libgit2/src/signature.h +1 -1
- data/vendor/libgit2/src/sortedcache.c +1 -1
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +36 -37
- data/vendor/libgit2/src/status.c +4 -1
- data/vendor/libgit2/src/{buffer.c → str.c} +157 -151
- data/vendor/libgit2/src/str.h +357 -0
- data/vendor/libgit2/src/streams/mbedtls.c +8 -6
- data/vendor/libgit2/src/streams/openssl_dynamic.h +3 -3
- data/vendor/libgit2/src/submodule.c +171 -159
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +68 -52
- data/vendor/libgit2/src/sysdir.h +15 -10
- data/vendor/libgit2/src/tag.c +29 -27
- data/vendor/libgit2/src/thread.h +3 -3
- data/vendor/libgit2/src/threadstate.c +3 -3
- data/vendor/libgit2/src/threadstate.h +1 -1
- data/vendor/libgit2/src/trace.c +1 -14
- data/vendor/libgit2/src/trace.h +5 -22
- data/vendor/libgit2/src/trailer.c +1 -1
- data/vendor/libgit2/src/transaction.c +1 -1
- data/vendor/libgit2/src/transport.c +10 -10
- data/vendor/libgit2/src/transports/auth.c +7 -9
- data/vendor/libgit2/src/transports/auth.h +2 -3
- data/vendor/libgit2/src/transports/auth_negotiate.c +12 -13
- data/vendor/libgit2/src/transports/auth_ntlm.c +10 -10
- data/vendor/libgit2/src/transports/auth_ntlm.h +0 -1
- data/vendor/libgit2/src/transports/git.c +9 -11
- data/vendor/libgit2/src/transports/http.c +37 -17
- data/vendor/libgit2/src/transports/http.h +2 -3
- data/vendor/libgit2/src/transports/httpclient.c +65 -65
- data/vendor/libgit2/src/transports/local.c +124 -116
- data/vendor/libgit2/src/transports/smart.c +51 -139
- data/vendor/libgit2/src/transports/smart.h +25 -31
- data/vendor/libgit2/src/transports/smart_pkt.c +33 -33
- data/vendor/libgit2/src/transports/smart_protocol.c +57 -39
- data/vendor/libgit2/src/transports/ssh.c +47 -112
- data/vendor/libgit2/src/transports/winhttp.c +50 -56
- data/vendor/libgit2/src/tree-cache.c +5 -5
- data/vendor/libgit2/src/tree-cache.h +2 -2
- data/vendor/libgit2/src/tree.c +59 -48
- data/vendor/libgit2/src/tree.h +1 -1
- data/vendor/libgit2/src/unix/map.c +0 -2
- data/vendor/libgit2/src/unix/posix.h +1 -4
- data/vendor/libgit2/src/unix/realpath.c +0 -2
- data/vendor/libgit2/src/util.c +14 -14
- data/vendor/libgit2/src/util.h +2 -28
- data/vendor/libgit2/src/vector.h +1 -1
- data/vendor/libgit2/src/win32/findfile.c +172 -116
- data/vendor/libgit2/src/win32/findfile.h +7 -4
- data/vendor/libgit2/src/win32/path_w32.c +140 -9
- data/vendor/libgit2/src/win32/path_w32.h +2 -0
- data/vendor/libgit2/src/win32/posix.h +0 -1
- data/vendor/libgit2/src/win32/posix_w32.c +11 -27
- data/vendor/libgit2/src/win32/w32_buffer.c +2 -3
- data/vendor/libgit2/src/win32/w32_buffer.h +2 -3
- data/vendor/libgit2/src/win32/w32_leakcheck.c +1 -1
- data/vendor/libgit2/src/worktree.c +116 -94
- data/vendor/libgit2/src/worktree.h +1 -1
- data/vendor/libgit2/src/xdiff/git-xdiff.h +53 -0
- data/vendor/libgit2/src/xdiff/xdiff.h +15 -15
- data/vendor/libgit2/src/xdiff/xdiffi.c +134 -108
- data/vendor/libgit2/src/xdiff/xemit.c +23 -7
- data/vendor/libgit2/src/xdiff/xhistogram.c +87 -78
- data/vendor/libgit2/src/xdiff/xinclude.h +1 -12
- data/vendor/libgit2/src/xdiff/xmerge.c +104 -117
- data/vendor/libgit2/src/xdiff/xpatience.c +6 -17
- data/vendor/libgit2/src/xdiff/xprepare.c +15 -20
- data/vendor/libgit2/src/xdiff/xutils.c +18 -7
- data/vendor/libgit2/src/zstream.c +5 -5
- data/vendor/libgit2/src/zstream.h +4 -4
- metadata +25 -10
- data/vendor/libgit2/src/buffer.h +0 -374
|
@@ -16,23 +16,23 @@
|
|
|
16
16
|
# PCRE_FOUND - True if pcre found.
|
|
17
17
|
|
|
18
18
|
# Look for the header file.
|
|
19
|
-
|
|
19
|
+
find_path(PCRE_INCLUDE_DIR NAMES pcreposix.h)
|
|
20
20
|
|
|
21
21
|
# Look for the library.
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
find_library(PCRE_LIBRARY NAMES pcre)
|
|
23
|
+
find_library(PCRE_POSIX_LIBRARY NAMES pcreposix)
|
|
24
24
|
|
|
25
25
|
# Handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if all listed variables are TRUE.
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
include(FindPackageHandleStandardArgs)
|
|
27
|
+
find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_POSIX_LIBRARY PCRE_INCLUDE_DIR)
|
|
28
28
|
|
|
29
29
|
# Copy the results to the output variables.
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
30
|
+
if(PCRE_FOUND)
|
|
31
|
+
set(PCRE_LIBRARIES ${PCRE_LIBRARY} ${PCRE_POSIX_LIBRARY})
|
|
32
|
+
set(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR})
|
|
33
|
+
else(PCRE_FOUND)
|
|
34
|
+
set(PCRE_LIBRARIES)
|
|
35
|
+
set(PCRE_INCLUDE_DIRS)
|
|
36
|
+
endif()
|
|
37
37
|
|
|
38
|
-
|
|
38
|
+
mark_as_advanced(PCRE_INCLUDE_DIRS PCRE_LIBRARIES)
|
|
@@ -16,22 +16,22 @@
|
|
|
16
16
|
# PCRE2_FOUND - True if pcre found.
|
|
17
17
|
|
|
18
18
|
# Look for the header file.
|
|
19
|
-
|
|
19
|
+
find_path(PCRE2_INCLUDE_DIR NAMES pcre2posix.h)
|
|
20
20
|
|
|
21
21
|
# Look for the library.
|
|
22
|
-
|
|
22
|
+
find_library(PCRE2_LIBRARY NAMES pcre2-8)
|
|
23
23
|
|
|
24
24
|
# Handle the QUIETLY and REQUIRED arguments and set PCRE2_FOUND to TRUE if all listed variables are TRUE.
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
include(FindPackageHandleStandardArgs)
|
|
26
|
+
find_package_handle_standard_args(PCRE2 DEFAULT_MSG PCRE2_LIBRARY PCRE2_INCLUDE_DIR)
|
|
27
27
|
|
|
28
28
|
# Copy the results to the output variables.
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
29
|
+
if(PCRE2_FOUND)
|
|
30
|
+
set(PCRE2_LIBRARIES ${PCRE2_LIBRARY})
|
|
31
|
+
set(PCRE2_INCLUDE_DIRS ${PCRE2_INCLUDE_DIR})
|
|
32
|
+
else(PCRE2_FOUND)
|
|
33
|
+
set(PCRE2_LIBRARIES)
|
|
34
|
+
set(PCRE2_INCLUDE_DIRS)
|
|
35
|
+
endif()
|
|
36
36
|
|
|
37
|
-
|
|
37
|
+
mark_as_advanced(PCRE2_INCLUDE_DIRS PCRE2_LIBRARIES)
|
|
@@ -1,28 +1,28 @@
|
|
|
1
|
-
|
|
1
|
+
include(FindPkgConfig)
|
|
2
2
|
|
|
3
3
|
# This function will find and set up a pkg-config based module.
|
|
4
4
|
# If a pc-file was found, it will resolve library paths to
|
|
5
5
|
# absolute paths. Furthermore, the function will automatically
|
|
6
6
|
# fall back to use static libraries in case no dynamic libraries
|
|
7
7
|
# were found.
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
function(FIND_PKGLIBRARIES prefix package)
|
|
9
|
+
pkg_check_modules(${prefix} ${package})
|
|
10
|
+
if(NOT ${prefix}_FOUND)
|
|
11
|
+
return()
|
|
12
|
+
endif()
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
14
|
+
foreach(LIBRARY ${${prefix}_LIBRARIES})
|
|
15
|
+
find_library(${LIBRARY}_RESOLVED ${LIBRARY} PATHS ${${prefix}_LIBRARY_DIRS})
|
|
16
|
+
if(${${LIBRARY}_RESOLVED} STREQUAL "${LIBRARY}_RESOLVED-NOTFOUND")
|
|
17
|
+
message(FATAL_ERROR "could not resolve ${LIBRARY}")
|
|
18
|
+
endif()
|
|
19
|
+
list(APPEND RESOLVED_LIBRARIES ${${LIBRARY}_RESOLVED})
|
|
20
|
+
endforeach()
|
|
21
21
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
set(${prefix}_FOUND 1 PARENT_SCOPE)
|
|
23
|
+
set(${prefix}_LIBRARIES ${RESOLVED_LIBRARIES} PARENT_SCOPE)
|
|
24
|
+
set(${prefix}_INCLUDE_DIRS ${${prefix}_INCLUDE_DIRS} PARENT_SCOPE)
|
|
25
|
+
set(${prefix}_LDFLAGS ${${prefix}_LDFLAGS} PARENT_SCOPE)
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
message(STATUS " Resolved libraries: ${RESOLVED_LIBRARIES}")
|
|
28
|
+
endfunction()
|
|
@@ -7,22 +7,22 @@
|
|
|
7
7
|
# SECURITY_HAS_SSLCREATECONTEXT
|
|
8
8
|
#
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
10
|
+
find_path(SECURITY_INCLUDE_DIR NAMES Security/Security.h)
|
|
11
|
+
find_library(SECURITY_LIBRARIES NAMES Security)
|
|
12
|
+
if(SECURITY_INCLUDE_DIR AND SECURITY_LIBRARIES)
|
|
13
|
+
if(NOT Security_FIND_QUIETLY)
|
|
14
|
+
message(STATUS "Found Security ${SECURITY_LIBRARIES}")
|
|
15
|
+
endif()
|
|
16
|
+
set(SECURITY_FOUND TRUE)
|
|
17
|
+
set(SECURITY_LDFLAGS "-framework Security")
|
|
18
|
+
check_library_exists("${SECURITY_LIBRARIES}" SSLCreateContext "Security/SecureTransport.h" SECURITY_HAS_SSLCREATECONTEXT)
|
|
19
|
+
endif()
|
|
20
20
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
if(Security_FIND_REQUIRED AND NOT SECURITY_FOUND)
|
|
22
|
+
message(FATAL_ERROR "Security not found")
|
|
23
|
+
endif()
|
|
24
24
|
|
|
25
|
-
|
|
25
|
+
mark_as_advanced(
|
|
26
26
|
SECURITY_INCLUDE_DIR
|
|
27
27
|
SECURITY_LIBRARIES
|
|
28
28
|
)
|
|
@@ -1,26 +1,20 @@
|
|
|
1
|
-
|
|
1
|
+
include(FeatureSummary)
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
check_struct_has_member("struct stat" st_mtim "sys/types.h;sys/stat.h"
|
|
4
4
|
HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C)
|
|
5
|
-
|
|
5
|
+
check_struct_has_member("struct stat" st_mtimespec "sys/types.h;sys/stat.h"
|
|
6
6
|
HAVE_STRUCT_STAT_ST_MTIMESPEC LANGUAGE C)
|
|
7
|
-
|
|
7
|
+
check_struct_has_member("struct stat" st_mtime_nsec sys/stat.h
|
|
8
8
|
HAVE_STRUCT_STAT_MTIME_NSEC LANGUAGE C)
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
if(HAVE_STRUCT_STAT_ST_MTIM)
|
|
11
|
+
check_struct_has_member("struct stat" st_mtim.tv_nsec sys/stat.h
|
|
12
12
|
HAVE_STRUCT_STAT_NSEC LANGUAGE C)
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
elseif(HAVE_STRUCT_STAT_ST_MTIMESPEC)
|
|
14
|
+
check_struct_has_member("struct stat" st_mtimespec.tv_nsec sys/stat.h
|
|
15
15
|
HAVE_STRUCT_STAT_NSEC LANGUAGE C)
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
else()
|
|
17
|
+
set(HAVE_STRUCT_STAT_NSEC ON )
|
|
18
|
+
endif()
|
|
19
19
|
|
|
20
|
-
|
|
21
|
-
OPTION( USE_NSEC "Care about sub-second file mtimes and ctimes" ON )
|
|
22
|
-
ELSE()
|
|
23
|
-
SET(USE_NSEC OFF)
|
|
24
|
-
ENDIF()
|
|
25
|
-
|
|
26
|
-
ADD_FEATURE_INFO(nanoseconds USE_NSEC "whether to use sub-second file mtimes and ctimes")
|
|
20
|
+
add_feature_info(nanoseconds USE_NSEC "support nanosecond precision file mtimes and ctimes")
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
|
|
1
|
+
include(EnableWarnings)
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
if(APPLE)
|
|
4
4
|
# We cannot simply CHECK_FUNCTION_EXISTS on macOS because
|
|
5
5
|
# MACOSX_DEPLOYMENT_TARGET may be set to a version in the past
|
|
6
6
|
# that doesn't have futimens. Instead we need to enable warnings
|
|
7
7
|
# as errors, then check for the symbol existing in `sys/stat.h`,
|
|
8
8
|
# then reset warnings as errors.
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
enable_warnings(error)
|
|
10
|
+
check_symbol_exists(futimens sys/stat.h HAVE_FUTIMENS)
|
|
11
|
+
disable_warnings(error)
|
|
12
|
+
else()
|
|
13
|
+
check_function_exists(futimens HAVE_FUTIMENS)
|
|
14
|
+
endif()
|
|
@@ -13,81 +13,74 @@
|
|
|
13
13
|
# Hint
|
|
14
14
|
# MBEDTLS_ROOT_DIR can be pointed to a local mbedTLS installation.
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
)
|
|
16
|
+
set(_MBEDTLS_ROOT_HINTS
|
|
17
|
+
${MBEDTLS_ROOT_DIR}
|
|
18
|
+
ENV MBEDTLS_ROOT_DIR)
|
|
20
19
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
)
|
|
20
|
+
set(_MBEDTLS_ROOT_HINTS_AND_PATHS
|
|
21
|
+
HINTS ${_MBEDTLS_ROOT_HINTS}
|
|
22
|
+
PATHS ${_MBEDTLS_ROOT_PATHS})
|
|
25
23
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
)
|
|
24
|
+
find_path(MBEDTLS_INCLUDE_DIR
|
|
25
|
+
NAMES mbedtls/version.h
|
|
26
|
+
${_MBEDTLS_ROOT_HINTS_AND_PATHS}
|
|
27
|
+
PATH_SUFFIXES include)
|
|
31
28
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
29
|
+
if(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARIES)
|
|
30
|
+
# Already in cache, be silent
|
|
31
|
+
set(MBEDTLS_FIND_QUIETLY TRUE)
|
|
32
|
+
endif()
|
|
36
33
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
${_MBEDTLS_ROOT_HINTS_AND_PATHS}
|
|
50
|
-
PATH_SUFFIXES library
|
|
51
|
-
)
|
|
34
|
+
find_library(MBEDTLS_LIBRARY
|
|
35
|
+
NAMES mbedtls libmbedtls
|
|
36
|
+
${_MBEDTLS_ROOT_HINTS_AND_PATHS}
|
|
37
|
+
PATH_SUFFIXES library)
|
|
38
|
+
find_library(MBEDX509_LIBRARY
|
|
39
|
+
NAMES mbedx509 libmbedx509
|
|
40
|
+
${_MBEDTLS_ROOT_HINTS_AND_PATHS}
|
|
41
|
+
PATH_SUFFIXES library)
|
|
42
|
+
find_library(MBEDCRYPTO_LIBRARY
|
|
43
|
+
NAMES mbedcrypto libmbedcrypto
|
|
44
|
+
${_MBEDTLS_ROOT_HINTS_AND_PATHS}
|
|
45
|
+
PATH_SUFFIXES library)
|
|
52
46
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
47
|
+
if(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
|
|
48
|
+
set(MBEDTLS_FOUND TRUE)
|
|
49
|
+
endif()
|
|
56
50
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
51
|
+
if(MBEDTLS_FOUND)
|
|
52
|
+
# split mbedTLS into -L and -l linker options, so we can set them for pkg-config
|
|
53
|
+
get_filename_component(MBEDTLS_LIBRARY_DIR ${MBEDTLS_LIBRARY} PATH)
|
|
54
|
+
get_filename_component(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
|
|
55
|
+
get_filename_component(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
|
|
56
|
+
get_filename_component(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
|
|
57
|
+
string(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
|
|
58
|
+
string(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
|
|
59
|
+
string(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
|
|
60
|
+
set(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
|
|
67
61
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
62
|
+
if(NOT MBEDTLS_FIND_QUIETLY)
|
|
63
|
+
message(STATUS "Found mbedTLS:")
|
|
64
|
+
file(READ ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLSCONTENT)
|
|
65
|
+
string(REGEX MATCH "MBEDTLS_VERSION_STRING +\"[0-9|.]+\"" MBEDTLSMATCH ${MBEDTLSCONTENT})
|
|
66
|
+
if(MBEDTLSMATCH)
|
|
67
|
+
string(REGEX REPLACE "MBEDTLS_VERSION_STRING +\"([0-9|.]+)\"" "\\1" MBEDTLS_VERSION ${MBEDTLSMATCH})
|
|
68
|
+
message(STATUS " version ${MBEDTLS_VERSION}")
|
|
69
|
+
endif()
|
|
70
|
+
message(STATUS " TLS: ${MBEDTLS_LIBRARY}")
|
|
71
|
+
message(STATUS " X509: ${MBEDX509_LIBRARY}")
|
|
72
|
+
message(STATUS " Crypto: ${MBEDCRYPTO_LIBRARY}")
|
|
73
|
+
endif()
|
|
74
|
+
else(MBEDTLS_FOUND)
|
|
75
|
+
if(MBEDTLS_FIND_REQUIRED)
|
|
76
|
+
message(FATAL_ERROR "Could not find mbedTLS")
|
|
77
|
+
endif()
|
|
78
|
+
endif()
|
|
85
79
|
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
)
|
|
80
|
+
mark_as_advanced(
|
|
81
|
+
MBEDTLS_INCLUDE_DIR
|
|
82
|
+
MBEDTLS_LIBRARY_DIR
|
|
83
|
+
MBEDTLS_LIBRARIES
|
|
84
|
+
MBEDTLS_LIBRARY
|
|
85
|
+
MBEDX509_LIBRARY
|
|
86
|
+
MBEDCRYPTO_LIBRARY)
|
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
# This function splits the sources files up into their appropriate
|
|
2
2
|
# subdirectories. This is especially useful for IDEs like Xcode and
|
|
3
|
-
# Visual Studio, so that you can navigate into the
|
|
3
|
+
# Visual Studio, so that you can navigate into the libgit2_tests project,
|
|
4
4
|
# and see the folders within the tests folder (instead of just seeing all
|
|
5
5
|
# source and tests in a single folder.)
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
6
|
+
function(IDE_SPLIT_SOURCES target)
|
|
7
|
+
if(MSVC_IDE OR CMAKE_GENERATOR STREQUAL Xcode)
|
|
8
|
+
get_target_property(sources ${target} SOURCES)
|
|
9
|
+
foreach(source ${sources})
|
|
10
|
+
if(source MATCHES ".*/")
|
|
11
|
+
string(REPLACE ${PROJECT_SOURCE_DIR}/ "" rel ${source})
|
|
12
|
+
if(rel)
|
|
13
|
+
string(REGEX REPLACE "/([^/]*)$" "" rel ${rel})
|
|
14
|
+
if(rel)
|
|
15
|
+
string(REPLACE "/" "\\\\" rel ${rel})
|
|
16
|
+
source_group(${rel} FILES ${source})
|
|
17
|
+
endif()
|
|
18
|
+
endif()
|
|
19
|
+
endif()
|
|
20
|
+
endforeach()
|
|
21
|
+
endif()
|
|
22
|
+
endfunction()
|
|
@@ -2,76 +2,76 @@
|
|
|
2
2
|
#
|
|
3
3
|
|
|
4
4
|
function(pkg_build_config)
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
set(options)
|
|
6
|
+
set(oneValueArgs NAME DESCRIPTION VERSION FILENAME LIBS_SELF)
|
|
7
|
+
set(multiValueArgs LIBS PRIVATE_LIBS REQUIRES CFLAGS)
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
cmake_parse_arguments(PKGCONFIG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
11
|
+
if (NOT DEFINED PKGCONFIG_FILENAME AND DEFINED PKGCONFIG_NAME)
|
|
12
|
+
set(PKGCONFIG_FILENAME ${PKGCONFIG_NAME})
|
|
13
|
+
endif()
|
|
14
|
+
if (NOT DEFINED PKGCONFIG_FILENAME)
|
|
15
|
+
message(FATAL_ERROR "Missing FILENAME argument")
|
|
16
|
+
endif()
|
|
17
|
+
set(PKGCONFIG_FILE "${PROJECT_BINARY_DIR}/${PKGCONFIG_FILENAME}.pc")
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
if (NOT DEFINED PKGCONFIG_DESCRIPTION)
|
|
20
|
+
message(FATAL_ERROR "Missing DESCRIPTION argument")
|
|
21
|
+
endif()
|
|
22
22
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
if (NOT DEFINED PKGCONFIG_VERSION)
|
|
24
|
+
message(FATAL_ERROR "Missing VERSION argument")
|
|
25
|
+
endif()
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
27
|
+
# Write .pc "header"
|
|
28
|
+
file(WRITE "${PKGCONFIG_FILE}"
|
|
29
|
+
"prefix=\"${CMAKE_INSTALL_PREFIX}\"\n"
|
|
30
|
+
"libdir=\"${CMAKE_INSTALL_FULL_LIBDIR}\"\n"
|
|
31
|
+
"includedir=\"${CMAKE_INSTALL_FULL_INCLUDEDIR}\"\n"
|
|
32
|
+
"\n"
|
|
33
|
+
"Name: ${PKGCONFIG_NAME}\n"
|
|
34
|
+
"Description: ${PKGCONFIG_DESCRIPTION}\n"
|
|
35
|
+
"Version: ${PKGCONFIG_VERSION}\n"
|
|
36
|
+
)
|
|
37
37
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
# Prepare Libs
|
|
39
|
+
if(NOT DEFINED PKGCONFIG_LIBS_SELF)
|
|
40
|
+
set(PKGCONFIG_LIBS_SELF "${PKGCONFIG_FILE}")
|
|
41
|
+
endif()
|
|
42
42
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
43
|
+
if(NOT DEFINED PKGCONFIG_LIBS)
|
|
44
|
+
set(PKGCONFIG_LIBS "-l${PKGCONFIG_LIBS_SELF}")
|
|
45
|
+
else()
|
|
46
|
+
list(INSERT PKGCONFIG_LIBS 0 "-l${PKGCONFIG_LIBS_SELF}")
|
|
47
|
+
endif()
|
|
48
48
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
list(REMOVE_DUPLICATES PKGCONFIG_LIBS)
|
|
50
|
+
string(REPLACE ";" " " PKGCONFIG_LIBS "${PKGCONFIG_LIBS}")
|
|
51
|
+
file(APPEND "${PKGCONFIG_FILE}" "Libs: -L\${libdir} ${PKGCONFIG_LIBS}\n")
|
|
52
52
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
53
|
+
# Prepare Libs.private
|
|
54
|
+
if(DEFINED PKGCONFIG_PRIVATE_LIBS)
|
|
55
|
+
list(REMOVE_DUPLICATES PKGCONFIG_PRIVATE_LIBS)
|
|
56
|
+
string(REPLACE ";" " " PKGCONFIG_PRIVATE_LIBS "${PKGCONFIG_PRIVATE_LIBS}")
|
|
57
|
+
file(APPEND "${PKGCONFIG_FILE}" "Libs.private: ${PKGCONFIG_PRIVATE_LIBS}\n")
|
|
58
|
+
endif()
|
|
59
59
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
60
|
+
# Prepare Requires.private
|
|
61
|
+
if(DEFINED PKGCONFIG_REQUIRES)
|
|
62
|
+
list(REMOVE_DUPLICATES PKGCONFIG_REQUIRES)
|
|
63
|
+
string(REPLACE ";" " " PKGCONFIG_REQUIRES "${PKGCONFIG_REQUIRES}")
|
|
64
|
+
file(APPEND "${PKGCONFIG_FILE}" "Requires.private: ${PKGCONFIG_REQUIRES}\n")
|
|
65
|
+
endif()
|
|
66
66
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
67
|
+
# Prepare Cflags
|
|
68
|
+
if(DEFINED PKGCONFIG_CFLAGS)
|
|
69
|
+
string(REPLACE ";" " " PKGCONFIG_CFLAGS "${PKGCONFIG_CFLAGS}")
|
|
70
|
+
else()
|
|
71
|
+
set(PKGCONFIG_CFLAGS "")
|
|
72
|
+
endif()
|
|
73
|
+
file(APPEND "${PKGCONFIG_FILE}" "Cflags: -I\${includedir} ${PKGCONFIG_CFLAGS}\n")
|
|
74
74
|
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
# Install .pc file
|
|
76
|
+
install(FILES "${PKGCONFIG_FILE}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
|
77
77
|
endfunction()
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
1
|
+
function(SanitizeBool VAR)
|
|
2
|
+
string(TOLOWER "${${VAR}}" VALUE)
|
|
3
|
+
if(VALUE STREQUAL "on")
|
|
4
|
+
set(${VAR} "ON" PARENT_SCOPE)
|
|
5
|
+
elseif(VALUE STREQUAL "yes")
|
|
6
|
+
set(${VAR} "ON" PARENT_SCOPE)
|
|
7
|
+
elseif(VALUE STREQUAL "true")
|
|
8
|
+
set(${VAR} "ON" PARENT_SCOPE)
|
|
9
|
+
elseif(VALUE STREQUAL "1")
|
|
10
|
+
set(${VAR} "ON" PARENT_SCOPE)
|
|
11
|
+
elseif(VALUE STREQUAL "off")
|
|
12
|
+
set(${VAR} "OFF" PARENT_SCOPE)
|
|
13
|
+
elseif(VALUE STREQUAL "no")
|
|
14
|
+
set(${VAR} "OFF" PARENT_SCOPE)
|
|
15
|
+
elseif(VALUE STREQUAL "false")
|
|
16
|
+
set(${VAR} "OFF" PARENT_SCOPE)
|
|
17
|
+
elseif(VALUE STREQUAL "0")
|
|
18
|
+
set(${VAR} "OFF" PARENT_SCOPE)
|
|
19
|
+
endif()
|
|
20
|
+
endfunction()
|