Commit Graph

254 Commits

Author SHA1 Message Date
Isaac Connor 89b199625a Add Optimised setting to use -O3 2020-04-14 16:59:22 -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 72ba972a2a whitespace 2020-04-05 13:23:36 -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 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
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
Andrew Bauer 3258d8e590 remove ZM_DIR_IMAGES (#2374) 2018-12-29 09:52:58 -05:00
Andrew Bauer 893048c306 remove option to build with no ffmpeg (#2365) 2018-12-28 10:46:27 -05:00
Isaac Connor 6ee72aa2d9 Implement libswresample support as an alternative to libavresample, which is deprecated 2018-12-20 14:06:56 -05:00
Andrew Bauer db81465fa2 allow one to set manpage destination 2018-12-07 09:47:00 -06:00
Andrew Bauer 18c3618e28 Arp tool (#2155)
* let cmake set path to arp

* declare cameras array

* fix probeV4L function

* typo

* fix another typo - my machine is possessed.

* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
Andy Bauer 02f8493b39 rpm packaging - remove support for sysvinit aka el6 2018-04-22 07:25:06 -05:00
Andrew Bauer 3c225c9f1c Migrate Webcache out of webroot (#2083)
* migrate webcache folder out of webroot, migrate htaccess files

* rpm specfile - add missing reference to cache folder

* fix submodule mixup
2018-04-19 15:01:46 -04:00
Andrew Bauer be5161391a patching crud no longer needed 2018-04-18 15:02:42 -05:00
Andrew Bauer 8bf502ee4f upgrade to cakephp 2.10.8 (#2067)
* upgrade lib folder to cakephp 2.10.8

* recreate bootstrap.php.in

* Bump Crud module 3.0.10 -> 3.1.0

* fix CrudBaseObject.php
2018-04-17 21:24:14 -04:00
Isaac 6efffe62b8 add c++-11 support for older CMAKE 2018-04-06 19:48:17 +02:00
Isaac Connor 27736fb5d9 Merge ../ZoneMinder.master into storageareas 2018-03-15 11:04:41 -04:00
Matthew Trescott 3475bfb672 Fix compilation on Ubuntu 18.04
I'm not entirely sure why this wasn't a problem with icconor's source package on launchpad. But, even unfamiliar as I am with CMake, it doesn't make sense to me to throw a fatal error by checking for a header that is already known to be unavailable.
2018-03-05 18:46:52 -05:00
Isaac Connor 865649d785 Turn on c++11 2018-03-01 19:20:00 -08:00
Isaac Connor 642c3f053a We are not using boost at this time. 2018-01-02 09:16:37 -08:00
Isaac Connor e679a8cfaa Fix conf.d dir 2017-09-23 13:40:43 -04:00
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
Andrew Bauer 613bbfb65b arm neon-check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect (#1966)
* arm neon - check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect

* skip arm neon check it not on linux
2017-08-21 12:02:28 -04:00
Isaac Connor da5438a6ff detect hardware accel capabilities 2017-08-16 12:16:15 -04:00
Isaac Connor 49464d381a Merge branch 'master' into storageareas 2017-08-14 10:44:40 -04:00
Andrew Bauer c353d5d17b Update CMakeLists.txt
fix erroneous creation of /etc/zm/conf.d/conf.d during an out-of-source build
2017-08-14 08:45:03 -05:00
Isaac Connor cfbfc0dd44 Merge branch 'master' into storageareas 2017-07-21 11:04:32 -04:00