8f9637f21a
Merge pull request #3129 from Carbenium/cmake-reformat
...
Build: Reindent the CMakeLists
2021-02-04 17:20:34 -05:00
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
dd527f0888
Consolidate __STDC_FORMAT_MACROS and __STDC_CONSTANT_MACROS definition
...
Move the definitions to zm_define.h and include the header at the appropriate locations.
These macros have not been adopted by the C++11 standard.
However glibc 2.17 (CentOS 7) still depends on them to provide the macros which are guarded by these defines.
2021-02-04 19:58:29 +01:00
c57c50fd4a
Merge pull request #3123 from Carbenium/catch2
...
[RFC] Add Catch2 as C++ test framework and some exemplary tests
2021-02-04 12:57:04 -05: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
513739aeb5
Merge pull request #3127 from Carbenium/header-cleanup
...
Cleanup and reorganize includes
2021-02-04 12:52:04 -05:00
21fdb1f345
Build: Add libLive555 to optlibsnotfound if not found
2021-02-04 18:02:08 +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
d0f307101b
Report on finding live555 libs
2021-01-29 15:49:40 -05:00
f9e003de22
Remove mp4v2 and libx264 from cmake
2021-01-28 09:07:54 -05:00
70bef9f22a
put back c++11 as the c std
2021-01-26 15:43:29 -05:00
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
d571b2dd98
Add live555 detection and HAVE_RTSP_SERVER config
2020-12-08 15:59:06 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
7326af95a9
Add ZM_FONTDIR as a place to store fonts for timestamping
2020-12-01 09:21:25 -05:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
7f06920f4a
convert polkit FATAL_ERROR to a WARNING so that codeQL will build
2020-10-02 10:33:42 -04:00
06519895d4
FATAL_ERROR to WARNING. The purpose is to allow codeQL to build cpp even though the perl deps havn't been installed.
2020-10-02 09:04:03 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
92cc03dbe8
fix pod2man out-of-source builds
2020-08-04 21:07:49 -05:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
dd25cb3b4e
We always build onvif
2020-05-09 17:34:15 -04:00
75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
ed7c0815de
Merge branch 'release-1.34'
2020-04-24 17:05:32 -04:00
e79a9d5abf
Can't set this policy yet as we havn't deprecate trusty for 1.34
2020-04-23 18:33:58 -04:00
01a2880100
fix build outside of build directory
2020-04-23 18:18:04 -04:00
32c137bb8e
Do not look for gnutls if libjwt is not found
2020-04-23 18:00:00 -04:00
4b53c7660e
Merge pull request #2911 from hax0kartik/dl-curl
...
Dynamically load libcurl, libvlc and libvnc
2020-04-22 09:49:37 -04:00
89b199625a
Add Optimised setting to use -O3
2020-04-14 16:59:22 -04:00
f15ffee043
Do not include the static libvnc library
2020-04-14 03:11:28 +05:30
640dfdd4a0
Dynamically load libvnc at runtime
2020-04-14 02:46:01 +05:30
1c4e4abbab
Do not look for gnutls if libjwt is not found
2020-04-14 00:40:47 +05:30
143ad394a9
Dynamically load libvlc
2020-04-14 00:15:06 +05:30
3a8b931cda
Fix stuff
2020-04-08 12:52:09 -04:00
64f57aa373
Dynamically load libcurl at runtime
2020-04-08 05:18:16 -04:00
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
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
72ba972a2a
whitespace
2020-04-05 13:23:36 -04:00
eed45ae66c
Fix 2892
2020-03-26 12:08:44 -04:00
5b1409d8df
Add cmake rules to check for libvnc
2020-03-25 23:29:22 -07:00
a70ab85407
Fix 2892
2020-03-24 09:29:19 -07:00
bb72e3000c
Merge pull request #2867 from veprbl/pr/cmake_install_full
...
cmake: use CMAKE_INSTALL_FULL_
2020-03-06 15:05:50 -05:00
3a129a8818
Merge pull request #2874 from hax0kartik/2810-libjwt
...
Add libjwt and remove gnutls-openssl wrapper
2020-03-06 14:48:45 -05:00
835966eb24
Merge pull request #2874 from hax0kartik/2810-libjwt
...
Add libjwt and remove gnutls-openssl wrapper
2020-03-05 15:30:27 -05:00
2091ad8c92
Add libjwt and remove gnutls-openssl wrapper
2020-03-05 09:29:27 -08:00
444c6fd372
Revert "Add libjwt as a optional library"
2020-03-04 13:57:27 -05:00
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
Peter Keresztes Schmidt
Isaac Connor
Andrew Bauer
hax0kartik