385 Commits

Author	SHA1	Message	Date
Isaac Connor	dd25cb3b4e	We always build onvif	2020-05-09 17:34:15 -04:00
Isaac Connor	75082064fd	Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream	2020-05-09 16:40:17 -04:00
Isaac Connor	732bb5416f	Merge branch 'master' into onvif_updated	2020-05-09 16:26:29 -04:00
Isaac Connor	4ff341a0f5	Merge branch 'master' into zma_to_thread	2020-05-02 18:03:42 -04:00
Isaac Connor	ed7c0815de	Merge branch 'release-1.34'	2020-04-24 17:05:32 -04:00
Isaac Connor	e79a9d5abf	Can't set this policy yet as we havn't deprecate trusty for 1.34	2020-04-23 18:33:58 -04:00
Isaac Connor	01a2880100	fix build outside of build directory	2020-04-23 18:18:04 -04:00
hax0kartik	32c137bb8e	Do not look for gnutls if libjwt is not found	2020-04-23 18:00:00 -04:00
Isaac Connor	4b53c7660e	Merge pull request #2911 from hax0kartik/dl-curl ... Dynamically load libcurl, libvlc and libvnc	2020-04-22 09:49:37 -04:00
Isaac Connor	89b199625a	Add Optimised setting to use -O3	2020-04-14 16:59:22 -04:00
hax0kartik	f15ffee043	Do not include the static libvnc library	2020-04-14 03:11:28 +05:30
hax0kartik	640dfdd4a0	Dynamically load libvnc at runtime	2020-04-14 02:46:01 +05:30
hax0kartik	1c4e4abbab	Do not look for gnutls if libjwt is not found	2020-04-14 00:40:47 +05:30
hax0kartik	143ad394a9	Dynamically load libvlc	2020-04-14 00:15:06 +05:30
hax0kartik	3a8b931cda	Fix stuff	2020-04-08 12:52:09 -04:00
hax0kartik	64f57aa373	Dynamically load libcurl at runtime	2020-04-08 05:18:16 -04:00
Isaac Connor	14c28715d8	Fix warnings about hashed authentication not being available when using gnutls. Also set cmake_policy(SET CMP0054 NEW) to quiet warnings	2020-04-05 13:36:20 -04:00
Isaac Connor	2d5d87839f	Fix warnings about hashed authentication not being available when using gnutls. Also set cmake_policy(SET CMP0054 NEW) to quiet warnings	2020-04-05 13:35:21 -04:00
Isaac Connor	72ba972a2a	whitespace	2020-04-05 13:23:36 -04:00
hax0kartik	eed45ae66c	Fix 2892	2020-03-26 12:08:44 -04:00
hax0kartik	5b1409d8df	Add cmake rules to check for libvnc	2020-03-25 23:29:22 -07:00
hax0kartik	a70ab85407	Fix 2892	2020-03-24 09:29:19 -07:00
Isaac Connor	bb72e3000c	Merge pull request #2867 from veprbl/pr/cmake_install_full ... cmake: use CMAKE_INSTALL_FULL_	2020-03-06 15:05:50 -05:00
Isaac Connor	3a129a8818	Merge pull request #2874 from hax0kartik/2810-libjwt ... Add libjwt and remove gnutls-openssl wrapper	2020-03-06 14:48:45 -05:00
Isaac Connor	835966eb24	Merge pull request #2874 from hax0kartik/2810-libjwt ... Add libjwt and remove gnutls-openssl wrapper	2020-03-05 15:30:27 -05:00
hax0kartik	2091ad8c92	Add libjwt and remove gnutls-openssl wrapper	2020-03-05 09:29:27 -08:00
Isaac Connor	444c6fd372	Revert "Add libjwt as a optional library"	2020-03-04 13:57:27 -05:00
Isaac Connor	641b191c34	Merge pull request #2867 from veprbl/pr/cmake_install_full ... cmake: use CMAKE_INSTALL_FULL_	2020-03-04 12:00:11 -05:00
Isaac Connor	5443e6385b	Merge pull request #2844 from hax0kartik/2810-libjwt ... Add libjwt as a optional library	2020-03-04 11:58:27 -05:00
hax0kartik	1dd8a71b52	Fix conditionals for when to look for openssl	2020-03-03 09:16:24 -08:00
hax0kartik	c048590b49	Look for openssl when libjwt is not found	2020-03-03 08:54:00 -08:00
hax0kartik	60d3243e69	Look for openssl as well when gnutls-openssl wrapper is not found	2020-03-03 08:35:24 -08:00
hax0kartik	ef3d7497d0	Only look for libjwt-gnutls and look for openssl only if gnutls is not found	2020-03-03 07:39:29 -08:00
Dmitry Kalinkin	a703d96c13	cmake: use CMAKE_INSTALL_FULL_ ... CMAKE_INSTALL_FULL_ is to be used as a definition of the full path. https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html	2020-03-03 08:41:53 -05:00
hax0kartik	cfcaf0fb81	Change how cmake looks for gnutls and gnutls-openssl	2020-03-01 08:42:39 -08:00
hax0kartik	70ef3d0eba	Look for gnutls-openssl and gnutls separately	2020-03-01 08:33:56 -08:00
Isaac Connor	40627ab102	fix build outside of build directory	2020-02-27 12:00:09 -05:00
Isaac Connor	40742503b9	Add a warning when there is no AVCODEC	2020-02-27 11:56:49 -05:00
hax0kartik	b1ce0ec0e8	Fix cmake	2020-02-23 06:18:32 -08:00
hax0kartik	46d77ee849	Add libjwt as a optional library	2020-02-20 07:55:59 -08:00
Isaac Connor	396be10d6f	Merge branch 'master' into zma_to_thread	2019-08-22 12:57:00 -04:00
Andrew Bauer	82672d9b86	stop bcrypt files from installing with zm	2019-06-23 13:20:08 -05:00
Andrew Bauer	00183b535a	rename bcrypt to libbcrypt to reflect name of the project	2019-06-23 12:56:04 -05:00
Andrew Bauer	8b37c0e9b0	remove bcrypt & jwt-cpp as submodules, bring in statically under src	2019-06-23 12:12:12 -05:00
Isaac Connor	c4d76f03c9	Introduce ZM_PATH_SHUTDOWN to cmake config	2019-05-27 12:09:32 -04:00
Pliable Pixels	d252a8ba30	build bcrypt as static	2019-05-02 10:52:21 -04:00
Pliable Pixels	65a57feedb	absolute path	2019-05-01 14:30:00 -04:00
Pliable Pixels	c663246f0a	try add_library instead	2019-05-01 14:22:10 -04:00
Pliable Pixels	a5de45419f	added sha1 and bcrypt submodules	2019-05-01 13:08:52 -04:00
Isaac Connor	a9e2011727	Merge branch 'storageareas' into zma_to_thread	2019-02-13 12:24:38 -05:00