6c9983155c
Build: Reindent the CMakeLists
...
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
bef4e4032f
Add Catch2 as C++ test framework
...
Use -DCMAKE_BUILD_TEST_SUITE=1 during CMake invocation to activate building the tests.
The 'tests' target builds the unit tests which can then be executed using the 'test' target.
We depend on the Catch2 version of the system.
Since development normally takes place on current OSs, this shouldn't pose a problem.
2021-02-04 18:53:54 +01:00
4db0dea1f2
Build: Make building man pages optional (enabled by default)
...
Add a new CMake option (-DBUILD_MAN) which can be used
to deactivate the man page build steps.
This is especially useful in a development situation where "make all"
is needlessly slowed down by these build steps.
2021-02-03 21:22:28 +01:00
1a400be11c
add zm_rtsp_server_adts_source.cpp to build
2021-01-22 19:23:36 -05:00
d6b59c0abf
Add rtsp_server files to CMakeLists.txt
2021-01-06 10:48:52 -05:00
a3ff81b279
Add zm_rtsp_server_thread.cpp to CMakeLists.txt
2020-12-09 12:20:01 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
528699f942
Use ctzll + new font format for improving drawing speed
2020-11-28 18:46:20 +05:30
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
06dfe9b987
Extract generated part of zm_config.h into zm_config_data.h
...
With this change IDEs have it easier to correctly reference the
variable/class declarations. Additionally one does not have to
regenerate the zm_config.h file when changing the code.
2020-08-25 23:33:56 +02:00
c0ab8bf90d
Merge branch 'master' into zma_to_thread
2020-08-07 17:53:32 -04:00
ed496e74fc
Update CMakeLists.txt
2020-08-07 07:54:58 +02:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
1d3ad05bb5
Start implementing VNC
2020-03-25 23:21:34 -07:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
158b9438d7
Explicitly link with libdl ( #2649 )
...
Otherwise on some systems linking would fail with
undefined reference to symbol 'dlclose@@GLIBC_2.2.5'
2019-06-27 15:08:29 -04:00
00183b535a
rename bcrypt to libbcrypt to reflect name of the project
2019-06-23 12:56:04 -05:00
8b37c0e9b0
remove bcrypt & jwt-cpp as submodules, bring in statically under src
2019-06-23 12:12:12 -05:00
06eb9a3bb2
merge typo
2019-05-16 16:15:16 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
eb005e8b9c
FIFO support for zoneminder zone debugging ( #2594 )
...
Adds fifo options for diagnostic images for much lower impact diagnostics mode. Diagnostic images are only written when there is a client listening for them (otherwise they are skipped). Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion. This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
2212244882
fix absolute path
2019-05-08 15:47:38 -04:00
d952fe7117
Moved to openSSL SHA1, initial JWT plugin
2019-05-04 11:52:53 -04:00
72325d12b7
move to wrapper
2019-05-03 11:40:35 -04:00
45b7814124
absolute path
2019-05-01 14:33:36 -04:00
65a57feedb
absolute path
2019-05-01 14:30:00 -04:00
c663246f0a
try add_library instead
2019-05-01 14:22:10 -04:00
ca24b504d4
fixed typo
2019-05-01 13:46:54 -04:00
8bbddadc12
put link_dir ahead of add_executable
2019-05-01 13:43:41 -04:00
07be830f94
added bcrypt to others
2019-05-01 13:35:18 -04:00
dd63fe86ce
add sha source
2019-05-01 13:28:39 -04:00
ddb7752226
added include path
2019-05-01 13:24:50 -04:00
c4b1bc19e0
added bcrypt and sha to src build process
2019-05-01 13:15:07 -04:00
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -05:00
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
db81465fa2
allow one to set manpage destination
2018-12-07 09:47:00 -06:00
ab9081e1bf
create a simple Frame class. Add a queue of Frames to the Event. When we get 10 of them write them out to the db.
2018-12-05 13:18:21 -05:00
0116a3aaca
ad zm_group?
2018-05-10 17:46:46 -04:00
94377a4652
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:57:50 -04:00
eea58091c8
add groups
2018-05-02 12:20:36 -07:00
c52d7c60eb
finish deprecating zma
2017-11-30 15:19:31 -05:00
224ca30c86
Merge branch 'storageareas' into zma_to_thread
2017-10-06 17:10:28 -04:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
ddb7305aab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-02 09:11:55 -04:00
9fef9d19dd
add zm_ffmpeg_input
2017-09-04 15:01:00 -04:00
c70706e253
Merge branch 'storageareas' into zma_to_thread
2017-09-04 14:38:00 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
da74f8d533
initial turn zma into a thread
2017-07-10 19:37:55 -04:00
b73c0ba978
rough in zm_ffmpeg_input and split out eventstream
2017-06-22 17:58:32 -04:00
c241b6dddd
Merge branch 'split_zmeventstream' into storageareas
2017-06-22 10:46:32 -04:00
Peter Keresztes Schmidt
Isaac Connor
hax0kartik
dmo
Daniel Schaefer
Andrew Bauer
Pliable Pixels
Mitch Capper
Isaac Connor
Isaac Connor
APHW2 MFGENG