Commit Graph

3098 Commits

Author SHA1 Message Date
Kfir Itzhak 36f525efae Correctly hard code man dir path into cmake this time hopefully 2013-10-29 12:43:28 +02:00
Kfir Itzhak 910200c369 Merge branch 'cmakeperlfixes' 2013-10-29 11:24:38 +02:00
Kfir Itzhak 604b7f4ccc Clean files generated by MakeMaker when running cmake's make clean target 2013-10-29 11:21:23 +02:00
Kfir Itzhak 23ec8266d9 Hard code man dir path into cmake to fix issues with some distros 2013-10-29 11:02:47 +02:00
Kfir Itzhak 234e742c10 Merge pull request #223 from fastolfe/batch-frame-inserts
Apply INSERTs in Event::AddFrames in batches to fix issue #222
2013-10-29 01:08:48 -07:00
Kfir Itzhak 0143969498 Do not print progress while building zoneminder perl modules unless CMAKE_VERBOSE_MAKEFILE is enabled 2013-10-29 10:01:29 +02:00
Kfir Itzhak b743375dcf Attempt to get travis working again by skipping whole system update 2013-10-29 09:15:24 +02:00
David Nesting 79c7a1b255 Apply INSERTs in Event::AddFrames in batches to avoid excessive query length 2013-10-26 18:41:12 -07:00
Kfir Itzhak 54512ff6b3 Fixed a mistake in the INSTALL file 2013-10-24 15:36:32 +03:00
Kfir Itzhak c2477eb661 cmake text improvements 2013-10-21 17:13:07 +03:00
Kfir Itzhak a341778ca2 Merge branch 'cmakefixes'
Conflicts:
	distros/fedora/zoneminder.cmake.f19.spec
	distros/redhat/zoneminder.cmake.el6.spec
2013-10-21 16:58:04 +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
Andrew Bauer c25a7ffc99 Update zoneminder.cmake.f19.spec
We need to strip the prefix from perl_vendorlib before passing it to cmake
2013-10-20 12:59:31 -05:00
Andrew Bauer 183ce4b422 Update zoneminder.cmake.el6.spec
We need to strip the prefix from perl_vendorlib macro before passing it to cmake.
2013-10-20 12:44:09 -05:00
Kfir Itzhak 17f2736860 Merge pull request #218 from ZoneMinder/ffmpegfixes
ffmpeg detection improvements
2013-10-19 13:06:03 -07:00
Kfir Itzhak cdd2920767 Merge pull request #217 from knnniggett/cmake_redhat
cmake support files for redhat/centos distros
2013-10-19 13:03:16 -07: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
Kfir Itzhak 9858c06a4f Merge pull request #215 from knnniggett/cmake_nox10
Add ZM_NO_X10 cmake option to toggle x10 support
2013-10-19 13:02:14 -07:00
Kfir Itzhak 4c803299bc Merge pull request #214 from knnniggett/cmake_fedora
Cmake support files for fedora distro
2013-10-19 13:01:12 -07:00
Andrew Bauer d544a92ccb change chkconfig default 2013-10-19 13:54:25 -05:00
Andrew Bauer 60962566a5 cmake support files for redhat/centos distros 2013-10-19 13:50:59 -05:00
Andrew Bauer 72973ff7e7 Add new zoneminder cmake specfile 2013-10-19 12:14:43 -05: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
Andy Bauer b1c76ad0b6 Cmake support files for fedora distro 2013-10-19 08:49:47 -05:00
Isaac Connor ae51ac5519 redo changes to use new dbFetch functions with parameter arrays 2013-10-18 14:24:08 -04:00
Isaac Connor 7fdb933d6b rework dbQuery, dbFetchOne to take a parameters array, and use it 2013-10-18 14:15:24 -04:00
Isaac Connor cde89a7144 more quoting removal, some slight optimisations 2013-10-17 21:03:24 -04:00
Isaac Connor 92591a6835 more removal of quotes 2013-10-17 17:05:50 -04:00
Isaac Connor ef765afa2d Merge branch 'master' into mysql2PDO 2013-10-17 17:02:44 -04:00
Isaac Connor 355c10c3a4 fix error when strict modes is on. 2013-10-17 17:02:17 -04:00
Isaac Connor 60e2703637 fix missing n 2013-10-17 17:01:37 -04:00
Isaac Connor 09fbdc9e35 forget the updates to this file 2013-10-17 16:57:05 -04:00
Isaac Connor 2a45506bff more quoting removal 2013-10-17 16:15:04 -04:00
Isaac Connor 0979830b91 more removal of exra quotes 2013-10-17 15:54:17 -04:00
Isaac Connor 36c4fad644 remove extra quoets since dbEcape does quoting now 2013-10-17 15:35:23 -04:00
Isaac Connor 870a59bed4 fix missing <?php. The missing full size tag makes the file fail when short tags are turned off 2013-10-17 14:23:25 -04:00
Isaac Connor 92d22b5202 Merge branch 'master' into mysql2PDO 2013-10-16 16:58:33 -04:00
Isaac Connor b126c5ae7e fix typo 2013-10-16 16:55:24 -04:00
Isaac Connor cd63b0a2a7 add defaults for ZM_DB_TYPE 2013-10-16 16:10:31 -04:00
Isaac Connor 5eb313b896 add config lline for DB type 2013-10-16 16:08:41 -04:00
Isaac Connor 9e2d7cfd24 initial convert to PDO with no testing 2013-10-16 16:07:58 -04:00
Kyle Johnson 5ead2a4394 Merge pull request #207 from knnniggett/prev_btn
Change Prev Button functionality.  Fixes #32.
2013-10-16 06:40:20 -07:00
Kyle Johnson 7bf4de37de Merge pull request #211 from kylejohnson/master
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-15 13:23:57 -07:00
kjohnson dff5b3aeb0 ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler) 2013-10-14 09:27:01 -04:00
Andrew Bauer 62dbb6e5fb Update README.Fedora
typo
2013-10-14 06:47:29 -05:00
Kfir Itzhak edcca74f95 Add detection status in cmake for optional libraries 2013-10-14 07:58:21 +03:00
Andy Bauer 32cf3663f3 Update README.Fedora
add "sudo"
2013-10-13 08:22:16 -05:00
Andy Bauer a3dc2b50d3 Update README.CentOS 2013-10-11 06:47:32 -05:00
Andy Bauer b7e69f0104 Update zoneminder.cmake.f19.spec
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:30:38 -05:00