rugged 1.3.2.3 → 1.4.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (329) hide show
  1. checksums.yaml +4 -4
  2. data/ext/rugged/extconf.rb +1 -1
  3. data/ext/rugged/rugged_config.c +7 -2
  4. data/ext/rugged/rugged_remote.c +17 -0
  5. data/lib/rugged/version.rb +1 -1
  6. data/vendor/libgit2/CMakeLists.txt +103 -276
  7. data/vendor/libgit2/COPYING +36 -19
  8. data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
  9. data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
  10. data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
  11. data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
  12. data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
  13. data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
  14. data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
  15. data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
  16. data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
  17. data/vendor/libgit2/cmake/FindPCRE.cmake +13 -13
  18. data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
  19. data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
  20. data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
  21. data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
  22. data/vendor/libgit2/cmake/Findfutimens.cmake +8 -8
  23. data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
  24. data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
  25. data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
  26. data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
  27. data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
  28. data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
  29. data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -100
  30. data/vendor/libgit2/cmake/SelectHashes.cmake +39 -49
  31. data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
  32. data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
  33. data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
  34. data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
  35. data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
  36. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +31 -31
  37. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +1 -1
  38. data/vendor/libgit2/deps/ntlmclient/ntlm.c +4 -4
  39. data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
  40. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
  41. data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
  42. data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
  43. data/vendor/libgit2/deps/zlib/adler32.c +0 -7
  44. data/vendor/libgit2/deps/zlib/crc32.c +288 -975
  45. data/vendor/libgit2/deps/zlib/crc32.h +436 -9441
  46. data/vendor/libgit2/deps/zlib/deflate.c +31 -83
  47. data/vendor/libgit2/deps/zlib/deflate.h +15 -12
  48. data/vendor/libgit2/deps/zlib/gzguts.h +2 -3
  49. data/vendor/libgit2/deps/zlib/infback.c +1 -2
  50. data/vendor/libgit2/deps/zlib/inffast.c +14 -14
  51. data/vendor/libgit2/deps/zlib/inflate.c +8 -39
  52. data/vendor/libgit2/deps/zlib/inflate.h +2 -3
  53. data/vendor/libgit2/deps/zlib/inftrees.c +3 -3
  54. data/vendor/libgit2/deps/zlib/trees.c +48 -27
  55. data/vendor/libgit2/deps/zlib/zlib.h +100 -126
  56. data/vendor/libgit2/deps/zlib/zutil.c +2 -2
  57. data/vendor/libgit2/deps/zlib/zutil.h +9 -12
  58. data/vendor/libgit2/include/git2/apply.h +16 -2
  59. data/vendor/libgit2/include/git2/attr.h +11 -2
  60. data/vendor/libgit2/include/git2/blame.h +4 -1
  61. data/vendor/libgit2/include/git2/blob.h +14 -1
  62. data/vendor/libgit2/include/git2/branch.h +2 -0
  63. data/vendor/libgit2/include/git2/buffer.h +18 -78
  64. data/vendor/libgit2/include/git2/cert.h +2 -2
  65. data/vendor/libgit2/include/git2/checkout.h +5 -2
  66. data/vendor/libgit2/include/git2/clone.h +3 -3
  67. data/vendor/libgit2/include/git2/commit.h +2 -0
  68. data/vendor/libgit2/include/git2/common.h +5 -12
  69. data/vendor/libgit2/include/git2/config.h +19 -3
  70. data/vendor/libgit2/include/git2/credential.h +2 -1
  71. data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
  72. data/vendor/libgit2/include/git2/deprecated.h +1 -1
  73. data/vendor/libgit2/include/git2/describe.h +7 -2
  74. data/vendor/libgit2/include/git2/diff.h +17 -9
  75. data/vendor/libgit2/include/git2/email.h +1 -1
  76. data/vendor/libgit2/include/git2/errors.h +1 -2
  77. data/vendor/libgit2/include/git2/filter.h +7 -2
  78. data/vendor/libgit2/include/git2/graph.h +1 -0
  79. data/vendor/libgit2/include/git2/ignore.h +1 -1
  80. data/vendor/libgit2/include/git2/index.h +11 -5
  81. data/vendor/libgit2/include/git2/indexer.h +19 -0
  82. data/vendor/libgit2/include/git2/merge.h +23 -3
  83. data/vendor/libgit2/include/git2/message.h +2 -0
  84. data/vendor/libgit2/include/git2/object.h +23 -0
  85. data/vendor/libgit2/include/git2/odb.h +37 -7
  86. data/vendor/libgit2/include/git2/odb_backend.h +1 -1
  87. data/vendor/libgit2/include/git2/pack.h +24 -8
  88. data/vendor/libgit2/include/git2/patch.h +8 -0
  89. data/vendor/libgit2/include/git2/pathspec.h +1 -1
  90. data/vendor/libgit2/include/git2/proxy.h +1 -1
  91. data/vendor/libgit2/include/git2/rebase.h +9 -1
  92. data/vendor/libgit2/include/git2/refdb.h +3 -0
  93. data/vendor/libgit2/include/git2/reflog.h +1 -1
  94. data/vendor/libgit2/include/git2/refs.h +2 -2
  95. data/vendor/libgit2/include/git2/remote.h +184 -37
  96. data/vendor/libgit2/include/git2/repository.h +14 -9
  97. data/vendor/libgit2/include/git2/reset.h +2 -2
  98. data/vendor/libgit2/include/git2/revparse.h +1 -1
  99. data/vendor/libgit2/include/git2/revwalk.h +4 -1
  100. data/vendor/libgit2/include/git2/signature.h +1 -1
  101. data/vendor/libgit2/include/git2/stash.h +3 -3
  102. data/vendor/libgit2/include/git2/status.h +9 -3
  103. data/vendor/libgit2/include/git2/submodule.h +7 -2
  104. data/vendor/libgit2/include/git2/sys/commit_graph.h +1 -1
  105. data/vendor/libgit2/include/git2/sys/odb_backend.h +2 -5
  106. data/vendor/libgit2/include/git2/sys/remote.h +31 -0
  107. data/vendor/libgit2/include/git2/sys/stream.h +1 -1
  108. data/vendor/libgit2/include/git2/sys/transport.h +25 -34
  109. data/vendor/libgit2/include/git2/tag.h +1 -0
  110. data/vendor/libgit2/include/git2/tree.h +4 -3
  111. data/vendor/libgit2/include/git2/types.h +7 -7
  112. data/vendor/libgit2/include/git2/version.h +3 -3
  113. data/vendor/libgit2/include/git2/worktree.h +12 -2
  114. data/vendor/libgit2/src/CMakeLists.txt +189 -315
  115. data/vendor/libgit2/src/annotated_commit.h +1 -1
  116. data/vendor/libgit2/src/apply.c +18 -18
  117. data/vendor/libgit2/src/apply.h +2 -2
  118. data/vendor/libgit2/src/attr.c +18 -18
  119. data/vendor/libgit2/src/attr_file.c +17 -17
  120. data/vendor/libgit2/src/attr_file.h +4 -4
  121. data/vendor/libgit2/src/attrcache.c +17 -12
  122. data/vendor/libgit2/src/blame_git.c +1 -1
  123. data/vendor/libgit2/src/blob.c +33 -26
  124. data/vendor/libgit2/src/blob.h +1 -1
  125. data/vendor/libgit2/src/branch.c +150 -109
  126. data/vendor/libgit2/src/branch.h +15 -3
  127. data/vendor/libgit2/src/buf.c +126 -0
  128. data/vendor/libgit2/src/buf.h +50 -0
  129. data/vendor/libgit2/src/cc-compat.h +1 -1
  130. data/vendor/libgit2/src/checkout.c +74 -68
  131. data/vendor/libgit2/src/cherrypick.c +10 -10
  132. data/vendor/libgit2/src/clone.c +66 -66
  133. data/vendor/libgit2/src/commit.c +128 -58
  134. data/vendor/libgit2/src/commit.h +24 -1
  135. data/vendor/libgit2/src/commit_graph.c +68 -53
  136. data/vendor/libgit2/src/commit_graph.h +10 -3
  137. data/vendor/libgit2/src/commit_list.c +2 -3
  138. data/vendor/libgit2/src/common.h +10 -3
  139. data/vendor/libgit2/src/config.c +99 -77
  140. data/vendor/libgit2/src/config.h +15 -2
  141. data/vendor/libgit2/src/config_file.c +103 -91
  142. data/vendor/libgit2/src/config_mem.c +9 -9
  143. data/vendor/libgit2/src/config_parse.c +27 -23
  144. data/vendor/libgit2/src/crlf.c +24 -21
  145. data/vendor/libgit2/src/date.c +10 -17
  146. data/vendor/libgit2/src/date.h +33 -0
  147. data/vendor/libgit2/src/describe.c +27 -19
  148. data/vendor/libgit2/src/diff.c +25 -8
  149. data/vendor/libgit2/src/diff.h +2 -4
  150. data/vendor/libgit2/src/diff_driver.c +34 -36
  151. data/vendor/libgit2/src/diff_driver.h +3 -3
  152. data/vendor/libgit2/src/diff_file.c +29 -20
  153. data/vendor/libgit2/src/diff_generate.c +30 -6
  154. data/vendor/libgit2/src/diff_generate.h +5 -3
  155. data/vendor/libgit2/src/diff_print.c +102 -95
  156. data/vendor/libgit2/src/diff_stats.c +40 -29
  157. data/vendor/libgit2/src/{message.h → diff_stats.h} +7 -6
  158. data/vendor/libgit2/src/diff_tform.c +9 -8
  159. data/vendor/libgit2/src/diff_xdiff.c +3 -8
  160. data/vendor/libgit2/src/email.c +54 -38
  161. data/vendor/libgit2/src/email.h +1 -1
  162. data/vendor/libgit2/src/errors.c +18 -18
  163. data/vendor/libgit2/src/features.h.in +6 -1
  164. data/vendor/libgit2/src/fetch.c +69 -24
  165. data/vendor/libgit2/src/fetch.h +1 -1
  166. data/vendor/libgit2/src/fetchhead.c +19 -19
  167. data/vendor/libgit2/src/filebuf.c +28 -28
  168. data/vendor/libgit2/src/filebuf.h +1 -1
  169. data/vendor/libgit2/src/filter.c +96 -52
  170. data/vendor/libgit2/src/filter.h +26 -5
  171. data/vendor/libgit2/src/fs_path.c +1912 -0
  172. data/vendor/libgit2/src/fs_path.h +752 -0
  173. data/vendor/libgit2/src/futils.c +91 -85
  174. data/vendor/libgit2/src/futils.h +26 -14
  175. data/vendor/libgit2/src/hash/sha1/collisiondetect.c +2 -2
  176. data/vendor/libgit2/src/hash/sha1/common_crypto.c +2 -2
  177. data/vendor/libgit2/src/hash/sha1/generic.c +2 -2
  178. data/vendor/libgit2/src/hash/sha1/mbedtls.c +2 -2
  179. data/vendor/libgit2/src/hash/sha1/openssl.c +2 -2
  180. data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +1 -1
  181. data/vendor/libgit2/src/hash/sha1/win32.c +6 -6
  182. data/vendor/libgit2/src/hash/sha1.h +3 -1
  183. data/vendor/libgit2/src/hash.c +67 -35
  184. data/vendor/libgit2/src/hash.h +12 -12
  185. data/vendor/libgit2/src/ident.c +18 -18
  186. data/vendor/libgit2/src/ignore.c +35 -34
  187. data/vendor/libgit2/src/ignore.h +2 -2
  188. data/vendor/libgit2/src/index.c +79 -80
  189. data/vendor/libgit2/src/index.h +6 -3
  190. data/vendor/libgit2/src/indexer.c +75 -57
  191. data/vendor/libgit2/src/iterator.c +64 -56
  192. data/vendor/libgit2/src/iterator.h +5 -5
  193. data/vendor/libgit2/src/khash.h +1 -1
  194. data/vendor/libgit2/src/libgit2.c +22 -19
  195. data/vendor/libgit2/src/mailmap.c +38 -36
  196. data/vendor/libgit2/src/merge.c +27 -27
  197. data/vendor/libgit2/src/merge.h +1 -14
  198. data/vendor/libgit2/src/merge_driver.c +2 -2
  199. data/vendor/libgit2/src/merge_file.c +13 -3
  200. data/vendor/libgit2/src/message.c +21 -10
  201. data/vendor/libgit2/src/midx.c +83 -66
  202. data/vendor/libgit2/src/midx.h +3 -3
  203. data/vendor/libgit2/src/mwindow.c +1 -1
  204. data/vendor/libgit2/src/net.c +278 -68
  205. data/vendor/libgit2/src/net.h +10 -3
  206. data/vendor/libgit2/src/netops.c +1 -1
  207. data/vendor/libgit2/src/netops.h +1 -1
  208. data/vendor/libgit2/src/notes.c +20 -29
  209. data/vendor/libgit2/src/object.c +49 -9
  210. data/vendor/libgit2/src/object.h +1 -1
  211. data/vendor/libgit2/src/odb.c +35 -32
  212. data/vendor/libgit2/src/odb.h +1 -1
  213. data/vendor/libgit2/src/odb_loose.c +68 -68
  214. data/vendor/libgit2/src/odb_mempack.c +18 -5
  215. data/vendor/libgit2/src/odb_pack.c +43 -43
  216. data/vendor/libgit2/src/oid.c +11 -4
  217. data/vendor/libgit2/src/oid.h +15 -0
  218. data/vendor/libgit2/src/pack-objects.c +41 -26
  219. data/vendor/libgit2/src/pack-objects.h +11 -6
  220. data/vendor/libgit2/src/pack.c +10 -10
  221. data/vendor/libgit2/src/patch.c +3 -3
  222. data/vendor/libgit2/src/patch.h +1 -0
  223. data/vendor/libgit2/src/patch_generate.c +27 -11
  224. data/vendor/libgit2/src/patch_generate.h +5 -5
  225. data/vendor/libgit2/src/patch_parse.c +24 -24
  226. data/vendor/libgit2/src/path.c +76 -1951
  227. data/vendor/libgit2/src/path.h +34 -741
  228. data/vendor/libgit2/src/pathspec.c +6 -6
  229. data/vendor/libgit2/src/pathspec.h +2 -2
  230. data/vendor/libgit2/src/posix.c +3 -3
  231. data/vendor/libgit2/src/posix.h +1 -0
  232. data/vendor/libgit2/src/pqueue.h +1 -1
  233. data/vendor/libgit2/src/proxy.c +4 -1
  234. data/vendor/libgit2/src/proxy.h +1 -1
  235. data/vendor/libgit2/src/push.c +30 -35
  236. data/vendor/libgit2/src/push.h +4 -16
  237. data/vendor/libgit2/src/rand.c +226 -0
  238. data/vendor/libgit2/src/rand.h +37 -0
  239. data/vendor/libgit2/src/reader.c +8 -8
  240. data/vendor/libgit2/src/reader.h +2 -2
  241. data/vendor/libgit2/src/rebase.c +89 -88
  242. data/vendor/libgit2/src/refdb_fs.c +447 -173
  243. data/vendor/libgit2/src/refs.c +32 -32
  244. data/vendor/libgit2/src/refs.h +2 -2
  245. data/vendor/libgit2/src/refspec.c +32 -37
  246. data/vendor/libgit2/src/refspec.h +5 -2
  247. data/vendor/libgit2/src/regexp.c +1 -1
  248. data/vendor/libgit2/src/remote.c +713 -419
  249. data/vendor/libgit2/src/remote.h +15 -10
  250. data/vendor/libgit2/src/repository.c +350 -467
  251. data/vendor/libgit2/src/repository.h +11 -10
  252. data/vendor/libgit2/src/reset.c +8 -5
  253. data/vendor/libgit2/src/revert.c +10 -10
  254. data/vendor/libgit2/src/revparse.c +48 -35
  255. data/vendor/libgit2/src/revwalk.c +7 -7
  256. data/vendor/libgit2/src/signature.c +12 -6
  257. data/vendor/libgit2/src/signature.h +1 -1
  258. data/vendor/libgit2/src/sortedcache.c +1 -1
  259. data/vendor/libgit2/src/sortedcache.h +1 -1
  260. data/vendor/libgit2/src/stash.c +36 -37
  261. data/vendor/libgit2/src/status.c +4 -1
  262. data/vendor/libgit2/src/{buffer.c → str.c} +157 -151
  263. data/vendor/libgit2/src/str.h +357 -0
  264. data/vendor/libgit2/src/streams/mbedtls.c +8 -6
  265. data/vendor/libgit2/src/streams/openssl_dynamic.h +3 -3
  266. data/vendor/libgit2/src/submodule.c +171 -159
  267. data/vendor/libgit2/src/submodule.h +1 -1
  268. data/vendor/libgit2/src/sysdir.c +68 -52
  269. data/vendor/libgit2/src/sysdir.h +15 -10
  270. data/vendor/libgit2/src/tag.c +29 -27
  271. data/vendor/libgit2/src/thread.h +3 -3
  272. data/vendor/libgit2/src/threadstate.c +3 -3
  273. data/vendor/libgit2/src/threadstate.h +1 -1
  274. data/vendor/libgit2/src/trace.c +1 -14
  275. data/vendor/libgit2/src/trace.h +5 -22
  276. data/vendor/libgit2/src/trailer.c +1 -1
  277. data/vendor/libgit2/src/transaction.c +1 -1
  278. data/vendor/libgit2/src/transport.c +10 -10
  279. data/vendor/libgit2/src/transports/auth.c +7 -9
  280. data/vendor/libgit2/src/transports/auth.h +2 -3
  281. data/vendor/libgit2/src/transports/auth_negotiate.c +12 -13
  282. data/vendor/libgit2/src/transports/auth_ntlm.c +10 -10
  283. data/vendor/libgit2/src/transports/auth_ntlm.h +0 -1
  284. data/vendor/libgit2/src/transports/git.c +9 -11
  285. data/vendor/libgit2/src/transports/http.c +37 -17
  286. data/vendor/libgit2/src/transports/http.h +2 -3
  287. data/vendor/libgit2/src/transports/httpclient.c +65 -65
  288. data/vendor/libgit2/src/transports/local.c +124 -116
  289. data/vendor/libgit2/src/transports/smart.c +51 -139
  290. data/vendor/libgit2/src/transports/smart.h +25 -31
  291. data/vendor/libgit2/src/transports/smart_pkt.c +33 -33
  292. data/vendor/libgit2/src/transports/smart_protocol.c +57 -39
  293. data/vendor/libgit2/src/transports/ssh.c +47 -112
  294. data/vendor/libgit2/src/transports/winhttp.c +50 -56
  295. data/vendor/libgit2/src/tree-cache.c +5 -5
  296. data/vendor/libgit2/src/tree-cache.h +2 -2
  297. data/vendor/libgit2/src/tree.c +59 -48
  298. data/vendor/libgit2/src/tree.h +1 -1
  299. data/vendor/libgit2/src/unix/map.c +0 -2
  300. data/vendor/libgit2/src/unix/posix.h +1 -4
  301. data/vendor/libgit2/src/unix/realpath.c +0 -2
  302. data/vendor/libgit2/src/util.c +14 -14
  303. data/vendor/libgit2/src/util.h +2 -28
  304. data/vendor/libgit2/src/vector.h +1 -1
  305. data/vendor/libgit2/src/win32/findfile.c +172 -116
  306. data/vendor/libgit2/src/win32/findfile.h +7 -4
  307. data/vendor/libgit2/src/win32/path_w32.c +140 -9
  308. data/vendor/libgit2/src/win32/path_w32.h +2 -0
  309. data/vendor/libgit2/src/win32/posix.h +0 -1
  310. data/vendor/libgit2/src/win32/posix_w32.c +11 -27
  311. data/vendor/libgit2/src/win32/w32_buffer.c +2 -3
  312. data/vendor/libgit2/src/win32/w32_buffer.h +2 -3
  313. data/vendor/libgit2/src/win32/w32_leakcheck.c +1 -1
  314. data/vendor/libgit2/src/worktree.c +116 -94
  315. data/vendor/libgit2/src/worktree.h +1 -1
  316. data/vendor/libgit2/src/xdiff/git-xdiff.h +53 -0
  317. data/vendor/libgit2/src/xdiff/xdiff.h +15 -15
  318. data/vendor/libgit2/src/xdiff/xdiffi.c +134 -108
  319. data/vendor/libgit2/src/xdiff/xemit.c +23 -7
  320. data/vendor/libgit2/src/xdiff/xhistogram.c +87 -78
  321. data/vendor/libgit2/src/xdiff/xinclude.h +1 -12
  322. data/vendor/libgit2/src/xdiff/xmerge.c +104 -117
  323. data/vendor/libgit2/src/xdiff/xpatience.c +6 -17
  324. data/vendor/libgit2/src/xdiff/xprepare.c +15 -20
  325. data/vendor/libgit2/src/xdiff/xutils.c +18 -7
  326. data/vendor/libgit2/src/zstream.c +5 -5
  327. data/vendor/libgit2/src/zstream.h +4 -4
  328. metadata +25 -10
  329. data/vendor/libgit2/src/buffer.h +0 -374
@@ -5,7 +5,7 @@
5
5
  # GSSAPI_ROOT_DIR - Set this variable to the root installation of GSSAPI
6
6
  #
7
7
  # Read-Only variables:
8
- # GSSAPI_FLAVOR_MIT - set to TURE if MIT Kerberos has been found
8
+ # GSSAPI_FLAVOR_MIT - set to TRUE if MIT Kerberos has been found
9
9
  # GSSAPI_FLAVOR_HEIMDAL - set to TRUE if Heimdal Kerberos has been found
10
10
  # GSSAPI_FOUND - system has GSSAPI
11
11
  # GSSAPI_INCLUDE_DIR - the GSSAPI include directory
@@ -25,300 +25,184 @@
25
25
  #
26
26
 
27
27
  find_path(GSSAPI_ROOT_DIR
28
- NAMES
29
- include/gssapi.h
30
- include/gssapi/gssapi.h
31
- HINTS
32
- ${_GSSAPI_ROOT_HINTS}
33
- PATHS
34
- ${_GSSAPI_ROOT_PATHS}
35
- )
28
+ NAMES include/gssapi.h include/gssapi/gssapi.h
29
+ HINTS ${_GSSAPI_ROOT_HINTS}
30
+ PATHS ${_GSSAPI_ROOT_PATHS})
36
31
  mark_as_advanced(GSSAPI_ROOT_DIR)
37
32
 
38
- if (UNIX)
39
- find_program(KRB5_CONFIG
40
- NAMES
41
- krb5-config
42
- PATHS
43
- ${GSSAPI_ROOT_DIR}/bin
44
- /opt/local/bin)
45
- mark_as_advanced(KRB5_CONFIG)
46
-
47
- if (KRB5_CONFIG)
48
- # Check if we have MIT KRB5
49
- execute_process(
50
- COMMAND
51
- ${KRB5_CONFIG} --vendor
52
- RESULT_VARIABLE
53
- _GSSAPI_VENDOR_RESULT
54
- OUTPUT_VARIABLE
55
- _GSSAPI_VENDOR_STRING)
56
-
57
- if (_GSSAPI_VENDOR_STRING MATCHES ".*Massachusetts.*")
58
- set(GSSAPI_FLAVOR_MIT TRUE)
59
- else()
60
- execute_process(
61
- COMMAND
62
- ${KRB5_CONFIG} --libs gssapi
63
- RESULT_VARIABLE
64
- _GSSAPI_LIBS_RESULT
65
- OUTPUT_VARIABLE
66
- _GSSAPI_LIBS_STRING)
67
-
68
- if (_GSSAPI_LIBS_STRING MATCHES ".*roken.*")
69
- set(GSSAPI_FLAVOR_HEIMDAL TRUE)
70
- endif()
71
- endif()
72
-
73
- # Get the include dir
74
- execute_process(
75
- COMMAND
76
- ${KRB5_CONFIG} --cflags gssapi
77
- RESULT_VARIABLE
78
- _GSSAPI_INCLUDE_RESULT
79
- OUTPUT_VARIABLE
80
- _GSSAPI_INCLUDE_STRING)
81
- string(REGEX REPLACE "(\r?\n)+$" "" _GSSAPI_INCLUDE_STRING "${_GSSAPI_INCLUDE_STRING}")
82
- string(REGEX REPLACE " *-I" "" _GSSAPI_INCLUDEDIR "${_GSSAPI_INCLUDE_STRING}")
83
- endif()
84
-
85
- if (NOT GSSAPI_FLAVOR_MIT AND NOT GSSAPI_FLAVOR_HEIMDAL)
86
- # Check for HEIMDAL
87
- find_package(PkgConfig)
88
- if (PKG_CONFIG_FOUND)
89
- pkg_check_modules(_GSSAPI heimdal-gssapi)
90
- endif (PKG_CONFIG_FOUND)
91
-
92
- if (_GSSAPI_FOUND)
93
- set(GSSAPI_FLAVOR_HEIMDAL TRUE)
94
- else()
95
- find_path(_GSSAPI_ROKEN
96
- NAMES
97
- roken.h
98
- PATHS
99
- ${GSSAPI_ROOT_DIR}/include
100
- ${_GSSAPI_INCLUDEDIR})
101
- if (_GSSAPI_ROKEN)
102
- set(GSSAPI_FLAVOR_HEIMDAL TRUE)
103
- endif()
104
- endif ()
105
- endif()
106
- endif (UNIX)
33
+ if(UNIX)
34
+ find_program(KRB5_CONFIG
35
+ NAMES krb5-config
36
+ PATHS ${GSSAPI_ROOT_DIR}/bin /opt/local/bin)
37
+ mark_as_advanced(KRB5_CONFIG)
38
+
39
+ if(KRB5_CONFIG)
40
+ # Check if we have MIT KRB5
41
+ execute_process(
42
+ COMMAND ${KRB5_CONFIG} --vendor
43
+ RESULT_VARIABLE _GSSAPI_VENDOR_RESULT
44
+ OUTPUT_VARIABLE _GSSAPI_VENDOR_STRING)
45
+
46
+ if(_GSSAPI_VENDOR_STRING MATCHES ".*Massachusetts.*")
47
+ set(GSSAPI_FLAVOR_MIT TRUE)
48
+ else()
49
+ execute_process(
50
+ COMMAND ${KRB5_CONFIG} --libs gssapi
51
+ RESULT_VARIABLE _GSSAPI_LIBS_RESULT
52
+ OUTPUT_VARIABLE _GSSAPI_LIBS_STRING)
53
+
54
+ if(_GSSAPI_LIBS_STRING MATCHES ".*roken.*")
55
+ set(GSSAPI_FLAVOR_HEIMDAL TRUE)
56
+ endif()
57
+ endif()
58
+
59
+ # Get the include dir
60
+ execute_process(
61
+ COMMAND ${KRB5_CONFIG} --cflags gssapi
62
+ RESULT_VARIABLE _GSSAPI_INCLUDE_RESULT
63
+ OUTPUT_VARIABLE _GSSAPI_INCLUDE_STRING)
64
+ string(REGEX REPLACE "(\r?\n)+$" "" _GSSAPI_INCLUDE_STRING "${_GSSAPI_INCLUDE_STRING}")
65
+ string(REGEX REPLACE " *-I" "" _GSSAPI_INCLUDEDIR "${_GSSAPI_INCLUDE_STRING}")
66
+ endif()
67
+
68
+ if(NOT GSSAPI_FLAVOR_MIT AND NOT GSSAPI_FLAVOR_HEIMDAL)
69
+ # Check for HEIMDAL
70
+ find_package(PkgConfig)
71
+ if(PKG_CONFIG_FOUND)
72
+ pkg_check_modules(_GSSAPI heimdal-gssapi)
73
+ endif()
74
+
75
+ if(_GSSAPI_FOUND)
76
+ set(GSSAPI_FLAVOR_HEIMDAL TRUE)
77
+ else()
78
+ find_path(_GSSAPI_ROKEN
79
+ NAMES roken.h
80
+ PATHS ${GSSAPI_ROOT_DIR}/include ${_GSSAPI_INCLUDEDIR})
81
+ if(_GSSAPI_ROKEN)
82
+ set(GSSAPI_FLAVOR_HEIMDAL TRUE)
83
+ endif()
84
+ endif()
85
+ endif()
86
+ endif()
107
87
 
108
88
  find_path(GSSAPI_INCLUDE_DIR
109
- NAMES
110
- gssapi.h
111
- gssapi/gssapi.h
112
- PATHS
113
- ${GSSAPI_ROOT_DIR}/include
114
- ${_GSSAPI_INCLUDEDIR}
115
- )
116
-
117
- if (GSSAPI_FLAVOR_MIT)
118
- find_library(GSSAPI_LIBRARY
119
- NAMES
120
- gssapi_krb5
121
- PATHS
122
- ${GSSAPI_ROOT_DIR}/lib
123
- ${_GSSAPI_LIBDIR}
124
- )
125
-
126
- find_library(KRB5_LIBRARY
127
- NAMES
128
- krb5
129
- PATHS
130
- ${GSSAPI_ROOT_DIR}/lib
131
- ${_GSSAPI_LIBDIR}
132
- )
133
-
134
- find_library(K5CRYPTO_LIBRARY
135
- NAMES
136
- k5crypto
137
- PATHS
138
- ${GSSAPI_ROOT_DIR}/lib
139
- ${_GSSAPI_LIBDIR}
140
- )
141
-
142
- find_library(COM_ERR_LIBRARY
143
- NAMES
144
- com_err
145
- PATHS
146
- ${GSSAPI_ROOT_DIR}/lib
147
- ${_GSSAPI_LIBDIR}
148
- )
149
-
150
- if (GSSAPI_LIBRARY)
151
- set(GSSAPI_LIBRARIES
152
- ${GSSAPI_LIBRARIES}
153
- ${GSSAPI_LIBRARY}
154
- )
155
- endif (GSSAPI_LIBRARY)
156
-
157
- if (KRB5_LIBRARY)
158
- set(GSSAPI_LIBRARIES
159
- ${GSSAPI_LIBRARIES}
160
- ${KRB5_LIBRARY}
161
- )
162
- endif (KRB5_LIBRARY)
163
-
164
- if (K5CRYPTO_LIBRARY)
165
- set(GSSAPI_LIBRARIES
166
- ${GSSAPI_LIBRARIES}
167
- ${K5CRYPTO_LIBRARY}
168
- )
169
- endif (K5CRYPTO_LIBRARY)
170
-
171
- if (COM_ERR_LIBRARY)
172
- set(GSSAPI_LIBRARIES
173
- ${GSSAPI_LIBRARIES}
174
- ${COM_ERR_LIBRARY}
175
- )
176
- endif (COM_ERR_LIBRARY)
177
- endif (GSSAPI_FLAVOR_MIT)
178
-
179
- if (GSSAPI_FLAVOR_HEIMDAL)
180
- find_library(GSSAPI_LIBRARY
181
- NAMES
182
- gssapi
183
- PATHS
184
- ${GSSAPI_ROOT_DIR}/lib
185
- ${_GSSAPI_LIBDIR}
186
- )
187
-
188
- find_library(KRB5_LIBRARY
189
- NAMES
190
- krb5
191
- PATHS
192
- ${GSSAPI_ROOT_DIR}/lib
193
- ${_GSSAPI_LIBDIR}
194
- )
195
-
196
- find_library(HCRYPTO_LIBRARY
197
- NAMES
198
- hcrypto
199
- PATHS
200
- ${GSSAPI_ROOT_DIR}/lib
201
- ${_GSSAPI_LIBDIR}
202
- )
203
-
204
- find_library(COM_ERR_LIBRARY
205
- NAMES
206
- com_err
207
- PATHS
208
- ${GSSAPI_ROOT_DIR}/lib
209
- ${_GSSAPI_LIBDIR}
210
- )
211
-
212
- find_library(HEIMNTLM_LIBRARY
213
- NAMES
214
- heimntlm
215
- PATHS
216
- ${GSSAPI_ROOT_DIR}/lib
217
- ${_GSSAPI_LIBDIR}
218
- )
219
-
220
- find_library(HX509_LIBRARY
221
- NAMES
222
- hx509
223
- PATHS
224
- ${GSSAPI_ROOT_DIR}/lib
225
- ${_GSSAPI_LIBDIR}
226
- )
227
-
228
- find_library(ASN1_LIBRARY
229
- NAMES
230
- asn1
231
- PATHS
232
- ${GSSAPI_ROOT_DIR}/lib
233
- ${_GSSAPI_LIBDIR}
234
- )
235
-
236
- find_library(WIND_LIBRARY
237
- NAMES
238
- wind
239
- PATHS
240
- ${GSSAPI_ROOT_DIR}/lib
241
- ${_GSSAPI_LIBDIR}
242
- )
243
-
244
- find_library(ROKEN_LIBRARY
245
- NAMES
246
- roken
247
- PATHS
248
- ${GSSAPI_ROOT_DIR}/lib
249
- ${_GSSAPI_LIBDIR}
250
- )
251
-
252
- if (GSSAPI_LIBRARY)
253
- set(GSSAPI_LIBRARIES
254
- ${GSSAPI_LIBRARIES}
255
- ${GSSAPI_LIBRARY}
256
- )
257
- endif (GSSAPI_LIBRARY)
258
-
259
- if (KRB5_LIBRARY)
260
- set(GSSAPI_LIBRARIES
261
- ${GSSAPI_LIBRARIES}
262
- ${KRB5_LIBRARY}
263
- )
264
- endif (KRB5_LIBRARY)
265
-
266
- if (HCRYPTO_LIBRARY)
267
- set(GSSAPI_LIBRARIES
268
- ${GSSAPI_LIBRARIES}
269
- ${HCRYPTO_LIBRARY}
270
- )
271
- endif (HCRYPTO_LIBRARY)
272
-
273
- if (COM_ERR_LIBRARY)
274
- set(GSSAPI_LIBRARIES
275
- ${GSSAPI_LIBRARIES}
276
- ${COM_ERR_LIBRARY}
277
- )
278
- endif (COM_ERR_LIBRARY)
279
-
280
- if (HEIMNTLM_LIBRARY)
281
- set(GSSAPI_LIBRARIES
282
- ${GSSAPI_LIBRARIES}
283
- ${HEIMNTLM_LIBRARY}
284
- )
285
- endif (HEIMNTLM_LIBRARY)
286
-
287
- if (HX509_LIBRARY)
288
- set(GSSAPI_LIBRARIES
289
- ${GSSAPI_LIBRARIES}
290
- ${HX509_LIBRARY}
291
- )
292
- endif (HX509_LIBRARY)
293
-
294
- if (ASN1_LIBRARY)
295
- set(GSSAPI_LIBRARIES
296
- ${GSSAPI_LIBRARIES}
297
- ${ASN1_LIBRARY}
298
- )
299
- endif (ASN1_LIBRARY)
300
-
301
- if (WIND_LIBRARY)
302
- set(GSSAPI_LIBRARIES
303
- ${GSSAPI_LIBRARIES}
304
- ${WIND_LIBRARY}
305
- )
306
- endif (WIND_LIBRARY)
307
-
308
- if (ROKEN_LIBRARY)
309
- set(GSSAPI_LIBRARIES
310
- ${GSSAPI_LIBRARIES}
311
- ${WIND_LIBRARY}
312
- )
313
- endif (ROKEN_LIBRARY)
314
- endif (GSSAPI_FLAVOR_HEIMDAL)
89
+ NAMES gssapi.h gssapi/gssapi.h
90
+ PATHS ${GSSAPI_ROOT_DIR}/include ${_GSSAPI_INCLUDEDIR})
91
+
92
+ if(GSSAPI_FLAVOR_MIT)
93
+ find_library(GSSAPI_LIBRARY
94
+ NAMES gssapi_krb5
95
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
96
+
97
+ find_library(KRB5_LIBRARY
98
+ NAMES krb5
99
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
100
+
101
+ find_library(K5CRYPTO_LIBRARY
102
+ NAMES k5crypto
103
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
104
+
105
+ find_library(COM_ERR_LIBRARY
106
+ NAMES com_err
107
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
108
+
109
+ if(GSSAPI_LIBRARY)
110
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${GSSAPI_LIBRARY})
111
+ endif()
112
+
113
+ if(KRB5_LIBRARY)
114
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${KRB5_LIBRARY})
115
+ endif()
116
+
117
+ if(K5CRYPTO_LIBRARY)
118
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${K5CRYPTO_LIBRARY})
119
+ endif()
120
+
121
+ if(COM_ERR_LIBRARY)
122
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${COM_ERR_LIBRARY})
123
+ endif()
124
+ endif()
125
+
126
+ if(GSSAPI_FLAVOR_HEIMDAL)
127
+ find_library(GSSAPI_LIBRARY
128
+ NAMES gssapi
129
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
130
+
131
+ find_library(KRB5_LIBRARY
132
+ NAMES krb5
133
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
134
+
135
+ find_library(HCRYPTO_LIBRARY
136
+ NAMES hcrypto
137
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
138
+
139
+ find_library(COM_ERR_LIBRARY
140
+ NAMES com_err
141
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
142
+
143
+ find_library(HEIMNTLM_LIBRARY
144
+ NAMES heimntlm
145
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
146
+
147
+ find_library(HX509_LIBRARY
148
+ NAMES hx509
149
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
150
+
151
+ find_library(ASN1_LIBRARY
152
+ NAMES asn1
153
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
154
+
155
+ find_library(WIND_LIBRARY
156
+ NAMES wind
157
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
158
+
159
+ find_library(ROKEN_LIBRARY
160
+ NAMES roken
161
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
162
+
163
+ if(GSSAPI_LIBRARY)
164
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${GSSAPI_LIBRARY})
165
+ endif()
166
+
167
+ if(KRB5_LIBRARY)
168
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${KRB5_LIBRARY})
169
+ endif()
170
+
171
+ if(HCRYPTO_LIBRARY)
172
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${HCRYPTO_LIBRARY})
173
+ endif()
174
+
175
+ if(COM_ERR_LIBRARY)
176
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${COM_ERR_LIBRARY})
177
+ endif()
178
+
179
+ if(HEIMNTLM_LIBRARY)
180
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${HEIMNTLM_LIBRARY})
181
+ endif()
182
+
183
+ if(HX509_LIBRARY)
184
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${HX509_LIBRARY})
185
+ endif()
186
+
187
+ if(ASN1_LIBRARY)
188
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${ASN1_LIBRARY})
189
+ endif()
190
+
191
+ if(WIND_LIBRARY)
192
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${WIND_LIBRARY})
193
+ endif()
194
+
195
+ if(ROKEN_LIBRARY)
196
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${WIND_LIBRARY})
197
+ endif()
198
+ endif()
315
199
 
316
200
  include(FindPackageHandleStandardArgs)
317
201
  find_package_handle_standard_args(GSSAPI DEFAULT_MSG GSSAPI_LIBRARIES GSSAPI_INCLUDE_DIR)
318
202
 
319
- if (GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
320
- set(GSSAPI_FOUND TRUE)
321
- endif (GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
203
+ if(GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
204
+ set(GSSAPI_FOUND TRUE)
205
+ endif(GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
322
206
 
323
207
  # show the GSSAPI_INCLUDE_DIRS and GSSAPI_LIBRARIES variables only in the advanced view
324
208
  mark_as_advanced(GSSAPI_INCLUDE_DIRS GSSAPI_LIBRARIES)
@@ -7,21 +7,21 @@
7
7
  # GSSFRAMEWORK_LDFLAGS
8
8
  #
9
9
 
10
- FIND_PATH(GSSFRAMEWORK_INCLUDE_DIR NAMES GSS.h)
11
- FIND_LIBRARY(GSSFRAMEWORK_LIBRARIES NAMES GSS)
12
- IF (GSSFRAMEWORK_INCLUDE_DIR AND GSSFRAMEWORK_LIBRARIES)
13
- IF (NOT CoreFoundation_FIND_QUIETLY)
14
- MESSAGE(STATUS "Found GSS.framework ${GSSFRAMEWORK_LIBRARIES}")
15
- ENDIF()
16
- SET(GSSFRAMEWORK_FOUND TRUE)
17
- SET(GSSFRAMEWORK_LDFLAGS "-framework GSS")
18
- ENDIF ()
10
+ find_path(GSSFRAMEWORK_INCLUDE_DIR NAMES GSS.h)
11
+ find_library(GSSFRAMEWORK_LIBRARIES NAMES GSS)
12
+ if(GSSFRAMEWORK_INCLUDE_DIR AND GSSFRAMEWORK_LIBRARIES)
13
+ if(NOT CoreFoundation_FIND_QUIETLY)
14
+ message(STATUS "Found GSS.framework ${GSSFRAMEWORK_LIBRARIES}")
15
+ endif()
16
+ set(GSSFRAMEWORK_FOUND TRUE)
17
+ set(GSSFRAMEWORK_LDFLAGS "-framework GSS")
18
+ endif()
19
19
 
20
- IF (GSS_FIND_REQUIRED AND NOT GSSFRAMEWORK_FOUND)
21
- MESSAGE(FATAL_ERROR "CoreFoundation not found")
22
- ENDIF()
20
+ if(GSS_FIND_REQUIRED AND NOT GSSFRAMEWORK_FOUND)
21
+ message(FATAL_ERROR "CoreFoundation not found")
22
+ endif()
23
23
 
24
- MARK_AS_ADVANCED(
24
+ mark_as_advanced(
25
25
  GSSFRAMEWORK_INCLUDE_DIR
26
26
  GSSFRAMEWORK_LIBRARIES
27
27
  GSSFRAMEWORK_LDFLAGS
@@ -10,30 +10,30 @@
10
10
  # HTTP_PARSER_VERSION_STRING - the version of http-parser found
11
11
 
12
12
  # Find the header and library
13
- FIND_PATH(HTTP_PARSER_INCLUDE_DIR NAMES http_parser.h)
14
- FIND_LIBRARY(HTTP_PARSER_LIBRARY NAMES http_parser libhttp_parser)
13
+ find_path(HTTP_PARSER_INCLUDE_DIR NAMES http_parser.h)
14
+ find_library(HTTP_PARSER_LIBRARY NAMES http_parser libhttp_parser)
15
15
 
16
16
  # Found the header, read version
17
- if (HTTP_PARSER_INCLUDE_DIR AND EXISTS "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h")
18
- FILE(READ "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h" HTTP_PARSER_H)
19
- IF (HTTP_PARSER_H)
20
- STRING(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MAJOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MAJOR "${HTTP_PARSER_H}")
21
- STRING(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MINOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MINOR "${HTTP_PARSER_H}")
22
- SET(HTTP_PARSER_VERSION_STRING "${HTTP_PARSER_VERSION_MAJOR}.${HTTP_PARSER_VERSION_MINOR}")
23
- ENDIF()
24
- UNSET(HTTP_PARSER_H)
25
- ENDIF()
17
+ if(HTTP_PARSER_INCLUDE_DIR AND EXISTS "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h")
18
+ file(READ "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h" HTTP_PARSER_H)
19
+ if(HTTP_PARSER_H)
20
+ string(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MAJOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MAJOR "${HTTP_PARSER_H}")
21
+ string(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MINOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MINOR "${HTTP_PARSER_H}")
22
+ set(HTTP_PARSER_VERSION_STRING "${HTTP_PARSER_VERSION_MAJOR}.${HTTP_PARSER_VERSION_MINOR}")
23
+ endif()
24
+ unset(HTTP_PARSER_H)
25
+ endif()
26
26
 
27
27
  # Handle the QUIETLY and REQUIRED arguments and set HTTP_PARSER_FOUND
28
28
  # to TRUE if all listed variables are TRUE
29
- INCLUDE(FindPackageHandleStandardArgs)
30
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(HTTP_Parser REQUIRED_VARS HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY)
29
+ include(FindPackageHandleStandardArgs)
30
+ find_package_handle_standard_args(HTTP_Parser REQUIRED_VARS HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY)
31
31
 
32
32
  # Hide advanced variables
33
- MARK_AS_ADVANCED(HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY)
33
+ mark_as_advanced(HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY)
34
34
 
35
35
  # Set standard variables
36
- IF (HTTP_PARSER_FOUND)
37
- SET(HTTP_PARSER_LIBRARIES ${HTTP_PARSER_LIBRARY})
36
+ if(HTTP_PARSER_FOUND)
37
+ set(HTTP_PARSER_LIBRARIES ${HTTP_PARSER_LIBRARY})
38
38
  set(HTTP_PARSER_INCLUDE_DIRS ${HTTP_PARSER_INCLUDE_DIR})
39
- ENDIF()
39
+ endif()
@@ -6,40 +6,40 @@
6
6
  # ICONV_LIBRARIES - Link these to use Iconv
7
7
  #
8
8
 
9
- IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
9
+ if(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
10
10
  # Already in cache, be silent
11
- SET(ICONV_FIND_QUIETLY TRUE)
12
- ENDIF()
11
+ set(ICONV_FIND_QUIETLY TRUE)
12
+ endif()
13
13
 
14
- FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
15
- CHECK_FUNCTION_EXISTS(iconv_open libc_has_iconv)
16
- FIND_LIBRARY(iconv_lib NAMES iconv libiconv libiconv-2 c)
14
+ find_path(ICONV_INCLUDE_DIR iconv.h)
15
+ check_function_exists(iconv_open libc_has_iconv)
16
+ find_library(iconv_lib NAMES iconv libiconv libiconv-2 c)
17
17
 
18
- IF(ICONV_INCLUDE_DIR AND libc_has_iconv)
19
- SET(ICONV_FOUND TRUE)
20
- SET(ICONV_LIBRARIES "")
21
- IF(NOT ICONV_FIND_QUIETLY)
22
- MESSAGE(STATUS "Found Iconv: provided by libc")
23
- ENDIF(NOT ICONV_FIND_QUIETLY)
24
- ELSEIF(ICONV_INCLUDE_DIR AND iconv_lib)
25
- SET(ICONV_FOUND TRUE)
18
+ if(ICONV_INCLUDE_DIR AND libc_has_iconv)
19
+ set(ICONV_FOUND TRUE)
20
+ set(ICONV_LIBRARIES "")
21
+ if(NOT ICONV_FIND_QUIETLY)
22
+ message(STATUS "Found Iconv: provided by libc")
23
+ endif(NOT ICONV_FIND_QUIETLY)
24
+ elseif(ICONV_INCLUDE_DIR AND iconv_lib)
25
+ set(ICONV_FOUND TRUE)
26
26
  # split iconv into -L and -l linker options, so we can
27
27
  # set them for pkg-config
28
- GET_FILENAME_COMPONENT(iconv_path ${iconv_lib} PATH)
29
- GET_FILENAME_COMPONENT(iconv_name ${iconv_lib} NAME_WE)
30
- STRING(REGEX REPLACE "^lib" "" iconv_name ${iconv_name})
31
- SET(ICONV_LIBRARIES "-L${iconv_path} -l${iconv_name}")
28
+ get_filename_component(iconv_path ${iconv_lib} PATH)
29
+ get_filename_component(iconv_name ${iconv_lib} NAME_WE)
30
+ string(REGEX REPLACE "^lib" "" iconv_name ${iconv_name})
31
+ set(ICONV_LIBRARIES "-L${iconv_path} -l${iconv_name}")
32
32
 
33
- IF(NOT ICONV_FIND_QUIETLY)
34
- MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}")
35
- ENDIF(NOT ICONV_FIND_QUIETLY)
36
- ELSE()
37
- IF(Iconv_FIND_REQUIRED)
38
- MESSAGE(FATAL_ERROR "Could not find Iconv")
39
- ENDIF(Iconv_FIND_REQUIRED)
40
- ENDIF()
33
+ if(NOT ICONV_FIND_QUIETLY)
34
+ message(STATUS "Found Iconv: ${ICONV_LIBRARIES}")
35
+ endif()
36
+ else()
37
+ if(Iconv_FIND_REQUIRED)
38
+ message(FATAL_ERROR "Could not find Iconv")
39
+ endif(Iconv_FIND_REQUIRED)
40
+ endif()
41
41
 
42
- MARK_AS_ADVANCED(
42
+ mark_as_advanced(
43
43
  ICONV_INCLUDE_DIR
44
44
  ICONV_LIBRARIES
45
45
  )
@@ -2,12 +2,12 @@
2
2
  # LIBSSH2_INCLUDE_DIR - the libssh2 include directory
3
3
  # LIBSSH2_LIBRARY - the libssh2 library name
4
4
 
5
- FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h)
5
+ find_path(LIBSSH2_INCLUDE_DIR libssh2.h)
6
6
 
7
- FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 libssh2)
7
+ find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2)
8
8
 
9
- INCLUDE(FindPackageHandleStandardArgs)
9
+ include(FindPackageHandleStandardArgs)
10
10
  find_package_handle_standard_args(LibSSH2
11
- REQUIRED_VARS LIBSSH2_LIBRARY LIBSSH2_INCLUDE_DIR)
11
+ REQUIRED_VARS LIBSSH2_LIBRARY LIBSSH2_INCLUDE_DIR)
12
12
 
13
- MARK_AS_ADVANCED(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY)
13
+ mark_as_advanced(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY)