ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,389 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

296 Commits

Author SHA1 Message Date
Andrew Bauer 457e61ea42 tie distro/opensuse folder into cmake build process 2014-03-19 19:07:36 -05:00
Kyle Johnson 9d3117a428 Bumped version to 1.27 2014-02-06 22:40:16 -05:00
Kfir Itzhak c1a74c45bc Fixed minor cmake warning 2013-12-27 18:04:24 +02:00
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Kfir Itzhak bf708a8373 Merge branch 'master' into curl 
Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/zm_camera.h
	src/zm_monitor.cpp
	web/skins/classic/views/console.php
	web/skins/classic/views/monitor.php
 2013-12-27 14:21:12 +02:00
Kfir Itzhak e652441996 Merge remote-tracking branch 'origin/master' into video 
Conflicts:
	configure.ac
	src/CMakeLists.txt
 2013-12-26 21:03:45 +02:00
Kfir Itzhak dce1cbf0ce Add header file checks for vlc/vlc.h 2013-12-21 06:47:12 +02:00
Edward Barnard 3321506b45 Working libvlc camera implementation. 2013-12-19 21:51:39 +00:00
Kfir Itzhak e9044b436d Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h 2013-12-19 19:21:30 +02:00
Kfir Itzhak 2b79ff2cbd Initial commit for saving events as videos :) 2013-12-19 18:38:07 +02:00
Kyle Johnson dc0d305811 Bump version to 1.26.5 2013-12-13 13:39:23 -05:00
Kfir Itzhak 56d3c7504a Put CMAKE_INCLUDE_CURRENT_DIR back in 2013-11-17 15:10:35 +02:00
Kfir Itzhak bed30d32b6 Remove round() mess 2013-11-15 11:41:26 +02:00
Kfir Itzhak 762e63653c Few minor cmake improvements, especially for whitespaces in paths 2013-11-15 11:12:33 +02:00
Kfir Itzhak 4a4018b8d7 Add automatic finding of the ffmpeg executable to cmake 2013-11-15 11:11:33 +02:00
Kfir Itzhak 82a92639ca Remove importing of binary directory in cmakecacheimport.sh 2013-11-15 10:44:31 +02:00
Kfir Itzhak 90d7ce98f1 Delete PATH_BUILD and TIME_BUILD from zm.conf and setup default for 
ZM_DB_TYPE
 2013-11-04 22:38:21 +02:00
Kfir Itzhak 8944531f75 Added cURL checks to cmake 2013-11-04 16:57:22 +02:00
Kfir Itzhak 9d5ac7ae8c Fix cmake installing wrong files in an out-of-source build 2013-11-04 09:56:40 +02:00
Kfir Itzhak 846fce0cb7 Fixed out-of-source building not finding config.h 2013-11-02 23:44:50 +02:00
Kfir Itzhak c2bd7c97ec First attempt at enabling out-of-source building for zm with cmake 2013-10-31 18:10:00 +02:00
Kfir Itzhak c2477eb661 cmake text improvements 2013-10-21 17:13:07 +03:00
Kfir Itzhak f5f573af93 Added an uninstall target to cmake and few text corrections to the INSTALL file 2013-10-21 16:11:37 +03:00
Kfir Itzhak eeca5928dd Merge pull request #216 from knnniggett/cmake_targetdistro 
Create ZM_TARGET_DISTRO option in cmake
 2013-10-19 13:02:55 -07:00
Andrew Bauer 539c760d3c Create ZM_TARGET_DISTRO 2013-10-19 09:38:58 -05:00
Andrew Bauer 54a22e7fe8 We need a toggle for x10 support 2013-10-19 09:22:59 -05:00
Kfir Itzhak edcca74f95 Add detection status in cmake for optional libraries 2013-10-14 07:58:21 +03:00
Kfir Itzhak 7d6cca13b8 Revert few changes that broke the cmake build in travis 2013-10-09 16:05:56 +03:00
Kfir Itzhak 49503891eb Added ZM_NO_FFMPEG option to skip ffmpeg checks and force building without ffmpeg 2013-10-09 15:58:14 +03:00
Kfir Itzhak b558d42cdc Improvements to cmake: Better support for CMAKE_PREFIX_PATH enviroment variable (and similar ones), added ZM_PERL_SUBPREFIX and ZM_PERL_USE_PATH options and improved detection of libraries and headers 2013-10-09 15:41:14 +03:00
Kfir Itzhak fcf969f575 Fix cmake not enabling mmap in zm perl modules correctly this time 2013-10-09 07:08:29 +03:00
Kfir Itzhak 378d1456dc Fixed cmake not enabling mmap in perl modules 2013-10-08 18:13:18 +03:00
Kfir Itzhak 022ecf4227 Merge pull request #201 from ZoneMinder/signalfixes 
Signal improvements and fixes
 2013-10-07 08:45:12 -07:00
Kfir Itzhak 6847e9016e Fix ZM_NO_MMAP cmake option 2013-10-07 15:06:26 +03:00
Kfir Itzhak 0a11d1bee5 Remove the ZM_NO_CRASHTRACE option from cmake. Not needed now that we have proper dependency checking 2013-10-07 14:43:35 +03:00
Kfir Itzhak 1d7f664627 1) Removed the use of deprecated and undocumented sigcontext (Replaced by siginfo and ucontext) 
2) Removed the checks for sigcontext, strsignal and siginfo.h
3) Added debugging code to the die handler
4) Using SA_RESTART in the hup and reload handlers to prevent certain functions returning EINTR
5) Added SIGINT and SIGQUIT to the term handler
 2013-10-07 10:37:58 +03:00
Kfir Itzhak 0bb2ee7efc More signal improvements: 
1) Cleaner code
2) Fixed the path displayed in the addr2line line
3) Improved dependency checking for backtrace
4) Few more improvements
 2013-10-07 02:37:50 +03:00
Kfir Itzhak a248bc9a10 Merge pull request #200 from knnniggett/zm_path_data 
Create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db
 2013-10-06 10:36:20 -07:00
Kfir Itzhak b5c536b134 Signal and backtrace improvements 2013-10-06 18:26:33 +03:00
Kfir Itzhak 18b72f9617 Fix detection of signal structures in cmake 2013-10-06 18:23:00 +03:00
Kfir Itzhak 9aaafbef86 Added support for @PKGDATADIR@ in CMakeLists.txt 2013-10-06 17:12:02 +03:00
mastertheknife c795afc833 Updated ZM version in cmake to 1.26.4 2013-10-04 19:53:59 +03:00
mastertheknife f043c6e955 Changed perl paths again, this time to <prefix>/<libdir>/perl5 and few improvements 2013-10-03 15:08:09 +03:00
mastertheknife 5fce4c516b Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5 2013-10-01 17:38:51 +03:00
mastertheknife 5af8e0844c Few cmake improvements 2013-09-30 14:31:36 +03:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00