diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc8454eab..35eae7c5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,36 +2,30 @@
 # Created by mastertheknife (Kfir Itzhak)
 # For more information and installation, see the INSTALL file
 #
-cmake_minimum_required (VERSION 2.8.7)
-project (zoneminder)
-file (STRINGS "version" zoneminder_VERSION)
+cmake_minimum_required(VERSION 2.8.7)
+project(zoneminder)
+file(STRINGS "version" zoneminder_VERSION)
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
 
 # Make sure the submodules are there
-if( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php" )
-message( SEND_ERROR "The git submodules are not available. Please run
-git submodule update --init --recursive")
-endif( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php" )
+if(NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php")
+  message(SEND_ERROR "The git submodules are not available. Please run git submodule update --init --recursive")
+endif()
 
 # CMake does not allow out-of-source build if CMakeCache.exists 
 # in the source folder. Abort and notify the user
-if(
-    (NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) 
-    AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
-        message(FATAL_ERROR " You are attempting to do an out-of-source build, 
-            but a cmake cache file for an in-source build exists. Please delete 
-            the file CMakeCache.txt from the source folder to proceed.")
-endif(
-    (NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) 
-    AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
+if((NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
+  message(FATAL_ERROR " You are attempting to do an out-of-source build,
+    but a cmake cache file for an in-source build exists. Please delete
+    the file CMakeCache.txt from the source folder to proceed.")
+endif()
 
 # Default build type. To change the build type, 
 # use the CMAKE_BUILD_TYPE configuration option.
 if(NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE 
-            Release CACHE STRING "Build type: Release or Debug" FORCE)
-endif(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Release or Debug" FORCE)
+endif()
 
 # Can assist in troubleshooting
 #set(CMAKE_VERBOSE_MAKEFILE ON)
@@ -40,26 +34,27 @@ endif(NOT CMAKE_BUILD_TYPE)
 # Host OS Check
 set(HOST_OS "")
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	set(HOST_OS "linux")
-endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+  set(HOST_OS "linux")
+endif()
 if(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
-	set(HOST_OS "solaris")
-	set(SOLARIS 1)
-endif(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
+  set(HOST_OS "solaris")
+  set(SOLARIS 1)
+endif()
 if(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
-	set(HOST_OS "BSD")
-	set(BSD 1)
-endif(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
+  set(HOST_OS "BSD")
+  set(BSD 1)
+endif()
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-	set(HOST_OS "darwin")
-endif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+  set(HOST_OS "darwin")
+endif()
 if(NOT HOST_OS)
-	message(FATAL_ERROR 
-            "ZoneMinder was unable to deterimine the host OS. Please report this. Value of CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
-endif(NOT HOST_OS)
+  message(FATAL_ERROR
+    "ZoneMinder was unable to deterimine the host OS. Please report this.
+    Value of CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
+endif()
 
-set (CMAKE_CXX_STANDARD 11)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 # Default CLFAGS and CXXFLAGS:
 set(CMAKE_C_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
 set(CMAKE_CXX_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
@@ -69,7 +64,7 @@ set(CMAKE_C_FLAGS_OPTIMISED "-Wall -D__STDC_CONSTANT_MACROS -O3")
 set(CMAKE_CXX_FLAGS_OPTIMISED "-Wall -D__STDC_CONSTANT_MACROS -O3")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-set (CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11)
 
 
 # GCC below 6.0 doesn't support __target__("fpu=neon") attribute, required for compiling ARM Neon code, otherwise compilation fails.
@@ -77,205 +72,202 @@ set (CMAKE_CXX_STANDARD 11)
 # because passing -fmpu=neon is unsafe to processors that don't support neon
 
 # Arm neon support only tested on Linux. If your arm hardware is running a non-Linux distro and is using gcc then contact us.
-IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ZM_SYSTEM_PROC)
-    IF((ZM_SYSTEM_PROC STREQUAL "") OR (ZM_SYSTEM_PROC STREQUAL "unknown"))
-        execute_process(COMMAND uname -m OUTPUT_VARIABLE ZM_SYSTEM_PROC ERROR_VARIABLE ZM_SYSTEM_PROC_ERR)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ZM_SYSTEM_PROC)
+  if((ZM_SYSTEM_PROC STREQUAL "") OR (ZM_SYSTEM_PROC STREQUAL "unknown"))
+    execute_process(COMMAND uname -m OUTPUT_VARIABLE ZM_SYSTEM_PROC ERROR_VARIABLE ZM_SYSTEM_PROC_ERR)
 
-        # maybe make the following error checks fatal
-        IF(ZM_SYSTEM_PROC_ERR)
-            message(WARNING "\nAn error occurred while attempting to determine the system processor:\n${ZM_SYSTEM_PROC_ERR}")
-        ENDIF(ZM_SYSTEM_PROC_ERR)
-        IF(NOT ZM_SYSTEM_PROC)
-           message(WARNING "\nUnable to determine the system processor. This may cause a build failure.\n")
-        ENDIF(ZM_SYSTEM_PROC)
+    # maybe make the following error checks fatal
+    if(ZM_SYSTEM_PROC_ERR)
+      message(WARNING "\nAn error occurred while attempting to determine the system processor:\n${ZM_SYSTEM_PROC_ERR}")
+    endif()
+    if(NOT ZM_SYSTEM_PROC)
+      message(WARNING "\nUnable to determine the system processor. This may cause a build failure.\n")
+    endif()
+  endif()
 
-    ENDIF((ZM_SYSTEM_PROC STREQUAL "") OR (ZM_SYSTEM_PROC STREQUAL "unknown"))
-
-    IF(ZM_SYSTEM_PROC MATCHES "^arm")
-	    IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-                EXEC_PROGRAM(grep ARGS " neon " "/proc/cpuinfo" OUTPUT_VARIABLE neonoutput RETURN_VALUE neonresult)
-		    IF(neonresult EQUAL 0)
-                        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpu=neon")
-                        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpu=neon")
-                        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -mfpu=neon")
-                        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mfpu=neon")
-		    ELSE(neonresult EQUAL 0)
-                        add_definitions(-DZM_STRIP_NEON=1)
-                        message(STATUS "ARM Neon is not available on this processor. Neon functions will be absent")
-                    ENDIF(neonresult EQUAL 0)
-            ENDIF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-    ENDIF(ZM_SYSTEM_PROC MATCHES "^arm")
-ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux")
+  if(ZM_SYSTEM_PROC MATCHES "^arm")
+    if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+      exec_program(grep ARGS " neon " "/proc/cpuinfo" OUTPUT_VARIABLE neonoutput RETURN_VALUE neonresult)
+      if(neonresult EQUAL 0)
+        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpu=neon")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpu=neon")
+        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -mfpu=neon")
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mfpu=neon")
+      else()
+        add_definitions(-DZM_STRIP_NEON=1)
+        message(STATUS "ARM Neon is not available on this processor. Neon functions will be absent")
+      endif()
+    endif()
+  endif()
+endif()
 
 # Modules that we need:
-include (GNUInstallDirs)
-include (CheckIncludeFile)
-include (CheckIncludeFiles)
-include (CheckFunctionExists)
-include (CheckPrototypeDefinition_fixed)
-include (CheckTypeSize)
-include (CheckStructHasMember)
-include (CheckSendfile)
+include(GNUInstallDirs)
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+include(CheckPrototypeDefinition_fixed)
+include(CheckTypeSize)
+include(CheckStructHasMember)
+include(CheckSendfile)
 
 # Configuration options
-mark_as_advanced( 
-    FORCE ZM_EXTRA_LIBS 
-    ZM_MYSQL_ENGINE 
-    ZM_NO_MMAP 
-    CMAKE_INSTALL_FULL_BINDIR 
-    ZM_PERL_MM_PARMS 
-    ZM_PERL_SEARCH_PATH 
-    ZM_TARGET_DISTRO 
-    ZM_PATH_MAP
-    ZM_PATH_ARP 
-    ZM_CONFIG_DIR
-    ZM_CONFIG_SUBDIR
-    ZM_SYSTEMD
-    ZM_MANPAGE_DEST_PREFIX)
+mark_as_advanced(
+  FORCE ZM_EXTRA_LIBS
+  ZM_MYSQL_ENGINE
+  ZM_NO_MMAP
+  CMAKE_INSTALL_FULL_BINDIR
+  ZM_PERL_MM_PARMS
+  ZM_PERL_SEARCH_PATH
+  ZM_TARGET_DISTRO
+  ZM_PATH_MAP
+  ZM_PATH_ARP
+  ZM_CONFIG_DIR
+  ZM_CONFIG_SUBDIR
+  ZM_SYSTEMD
+  ZM_MANPAGE_DEST_PREFIX)
 
 option(BUILD_TEST_SUITE "Build the test suite" 0)
 option(BUILD_MAN "Build man pages" 1)
 
 set(ZM_RUNDIR "/var/run/zm" CACHE PATH
-    "Location of transient process files, default: /var/run/zm")
-set(ZM_SOCKDIR "/var/run/zm" CACHE PATH 
-    "Location of Unix domain socket files, default /var/run/zm")
-set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH 
-    "Location of temporary files, default: /tmp/zm")
-set(ZM_LOGDIR "/var/log/zm" CACHE PATH 
-    "Location of generated log files, default: /var/log/zm")
-set(ZM_WEBDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/www" CACHE PATH 
-    "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
-set(ZM_CGIDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
-    "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
-set(ZM_CACHEDIR "/var/cache/zoneminder" CACHE PATH 
-    "Location of the web server cache busting files, default: /var/cache/zoneminder")
-set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH 
-    "Location of dynamic content (events and images), default: /var/lib/zoneminder")
+  "Location of transient process files, default: /var/run/zm")
+set(ZM_SOCKDIR "/var/run/zm" CACHE PATH
+  "Location of Unix domain socket files, default /var/run/zm")
+set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH
+  "Location of temporary files, default: /tmp/zm")
+set(ZM_LOGDIR "/var/log/zm" CACHE PATH
+  "Location of generated log files, default: /var/log/zm")
+set(ZM_WEBDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/www" CACHE PATH
+  "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
+set(ZM_CGIDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH
+  "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
+set(ZM_CACHEDIR "/var/cache/zoneminder" CACHE PATH
+  "Location of the web server cache busting files, default: /var/cache/zoneminder")
+set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH
+  "Location of dynamic content (events and images), default: /var/lib/zoneminder")
 set(ZM_FONTDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/fonts" CACHE PATH
   "Location of the font files used for timestamping, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/fonts")
 
-set(ZM_DB_HOST "localhost" CACHE STRING 
-    "Hostname where ZoneMinder database located, default: localhost")
-set(ZM_DB_NAME "zm" CACHE STRING 
-    "Name of ZoneMinder database, default: zm")
-set(ZM_DB_USER "zmuser" CACHE STRING 
-    "Name of ZoneMinder database user, default: zmuser")
-set(ZM_DB_PASS "zmpass" CACHE STRING 
-    "Password of ZoneMinder database user, default: zmpass")
-set(ZM_WEB_USER "" CACHE STRING 
-    "The user apache or the local web server runs on. Leave empty for automatic detection. 
+set(ZM_DB_HOST "localhost" CACHE STRING
+  "Hostname where ZoneMinder database located, default: localhost")
+set(ZM_DB_NAME "zm" CACHE STRING
+  "Name of ZoneMinder database, default: zm")
+set(ZM_DB_USER "zmuser" CACHE STRING
+  "Name of ZoneMinder database user, default: zmuser")
+set(ZM_DB_PASS "zmpass" CACHE STRING
+  "Password of ZoneMinder database user, default: zmpass")
+set(ZM_WEB_USER "" CACHE STRING
+  "The user apache or the local web server runs on. Leave empty for automatic detection.
      If that fails, you can use this variable to force")
-set(ZM_WEB_GROUP "" CACHE STRING 
-    "The group apache or the local web server runs on, 
+set(ZM_WEB_GROUP "" CACHE STRING
+  "The group apache or the local web server runs on,
     Leave empty to be the same as the web user")
-set(ZM_DIR_EVENTS "${ZM_CONTENTDIR}/events" CACHE PATH 
-    "Location where events are recorded to, default: ZM_CONTENTDIR/events")
+set(ZM_DIR_EVENTS "${ZM_CONTENTDIR}/events" CACHE PATH
+  "Location where events are recorded to, default: ZM_CONTENTDIR/events")
 set(ZM_DIR_SOUNDS "sounds" CACHE PATH
-    "Location to look for optional sound files, default: sounds")
+  "Location to look for optional sound files, default: sounds")
 set(ZM_PATH_ZMS "/cgi-bin/nph-zms" CACHE PATH
-    "Web url to zms streaming server, default: /cgi-bin/nph-zms")
+  "Web url to zms streaming server, default: /cgi-bin/nph-zms")
 set(ZM_PATH_SHUTDOWN "/sbin/shutdown" CACHE PATH
-    "Path to shutdown binary, default: /sbin/shutdown")
+  "Path to shutdown binary, default: /sbin/shutdown")
 
 # Advanced
 set(ZM_PATH_MAP "/dev/shm" CACHE PATH
-    "Location to save mapped memory files, default: /dev/shm")
+  "Location to save mapped memory files, default: /dev/shm")
 set(ZM_PATH_ARP "" CACHE PATH
-    "Full path to compatible arp binary. Leave empty for automatic detection.")
-set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH 
-    "Location of ZoneMinder configuration, default system config directory")
-set(ZM_CONFIG_SUBDIR "${ZM_CONFIG_DIR}/conf.d" CACHE PATH 
-    "Location of ZoneMinder configuration subfolder, default: ZM_CONFIG_DIR/conf.d")
-set(ZM_EXTRA_LIBS "" CACHE STRING 
-    "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
-set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING 
-    "MySQL engine to use with database, default: InnoDB")
-set(ZM_NO_MMAP "OFF" CACHE BOOL 
-    "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you 
+  "Full path to compatible arp binary. Leave empty for automatic detection.")
+set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH
+  "Location of ZoneMinder configuration, default system config directory")
+set(ZM_CONFIG_SUBDIR "${ZM_CONFIG_DIR}/conf.d" CACHE PATH
+  "Location of ZoneMinder configuration subfolder, default: ZM_CONFIG_DIR/conf.d")
+set(ZM_EXTRA_LIBS "" CACHE STRING
+  "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
+set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING
+  "MySQL engine to use with database, default: InnoDB")
+set(ZM_NO_MMAP "OFF" CACHE BOOL
+  "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you
     experience problems with the shared memory. default: OFF")
-set(ZM_NO_LIBVLC "OFF" CACHE BOOL 
-"Set to ON to skip libvlc checks and force building ZM without libvlc. default: OFF")
-set(ZM_NO_LIBVNC "OFF" CACHE BOOL 
-"Set to ON to skip libvnc checks and force building ZM without libvnc. default: OFF")
-set(ZM_NO_CURL "OFF" CACHE BOOL 
-    "Set to ON to skip cURL checks and force building ZM without cURL. default: OFF")
-set(ZM_NO_X10 "OFF" CACHE BOOL 
-    "Set to ON to build ZoneMinder without X10 support. default: OFF")
-set(ZM_ONVIF "ON" CACHE BOOL 
-    "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not 
+set(ZM_NO_LIBVLC "OFF" CACHE BOOL
+  "Set to ON to skip libvlc checks and force building ZM without libvlc. default: OFF")
+set(ZM_NO_LIBVNC "OFF" CACHE BOOL
+  "Set to ON to skip libvnc checks and force building ZM without libvnc. default: OFF")
+set(ZM_NO_CURL "OFF" CACHE BOOL
+  "Set to ON to skip cURL checks and force building ZM without cURL. default: OFF")
+set(ZM_NO_X10 "OFF" CACHE BOOL
+  "Set to ON to build ZoneMinder without X10 support. default: OFF")
+set(ZM_ONVIF "ON" CACHE BOOL
+  "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not
     work with all cameras claiming to be ONVIF compliant. default: ON")
 set(ZM_NO_RTSPSERVER "OFF" CACHE BOOL
   "Set to ON to skip live555 checks and force building ZM without rtsp server support. default: OFF")
-set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING 
-	"By default, ZoneMinder's Perl modules are installed into the Vendor folders, 
+set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING
+  "By default, ZoneMinder's Perl modules are installed into the Vendor folders,
 	as defined by your installation of Perl. You can change that here. Consult Perl's 
 	MakeMaker documentation for a definition of acceptable parameters. If you set this 
 	to something that causes the modules to be installed outside Perl's normal search 
 	path, then you will also need to set ZM_PERL_SEARCH_PATH accordingly.")
-set(ZM_PERL_SEARCH_PATH "" CACHE PATH 
-	"Use to add a folder to your Perl's search path. This will need to be set in cases 
+set(ZM_PERL_SEARCH_PATH "" CACHE PATH
+  "Use to add a folder to your Perl's search path. This will need to be set in cases
 	where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are 
 	installed outside Perl's default search path.")
-set(ZM_TARGET_DISTRO "" CACHE STRING 
-    "Build ZoneMinder for a specific distribution.  Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
-set(ZM_SYSTEMD "OFF" CACHE BOOL 
-    "Set to ON to force building ZM with systemd support. default: OFF")
-set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH 
-	"Relative path used to install ZoneMinder's Man pages into a
-         non-standard folder. Most Linux users will not need to change this.
-         BSD users may need to set this.")
+set(ZM_TARGET_DISTRO "" CACHE STRING
+  "Build ZoneMinder for a specific distribution.  Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
+set(ZM_SYSTEMD "OFF" CACHE BOOL
+  "Set to ON to force building ZM with systemd support. default: OFF")
+set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH
+  "Relative path used to install ZoneMinder's Man pages into a
+    non-standard folder. Most Linux users will not need to change this.
+    BSD users may need to set this.")
 
 # Reassign some variables if a target distro has been specified
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
-	set(ZM_RUNDIR "/var/run/zoneminder")
-	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
-	set(ZM_TMPDIR "/var/lib/zoneminder/temp")
-	set(ZM_LOGDIR "/var/log/zoneminder")
-	set(ZM_CONFIG_DIR "/etc/zm")
-        set(ZM_CONFIG_SUBDIR "/etc/zm/conf.d")
-	set(ZM_WEBDIR "/usr/share/zoneminder/www")
-	set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
-	set(ZM_DIR_EVENTS "/var/lib/zoneminder/events")
-	set(ZM_PATH_ZMS "/cgi-bin-zm/nph-zms")
+  set(ZM_RUNDIR "/var/run/zoneminder")
+  set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
+  set(ZM_TMPDIR "/var/lib/zoneminder/temp")
+  set(ZM_LOGDIR "/var/log/zoneminder")
+  set(ZM_CONFIG_DIR "/etc/zm")
+  set(ZM_CONFIG_SUBDIR "/etc/zm/conf.d")
+  set(ZM_WEBDIR "/usr/share/zoneminder/www")
+  set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
+  set(ZM_DIR_EVENTS "/var/lib/zoneminder/events")
+  set(ZM_PATH_ZMS "/cgi-bin-zm/nph-zms")
 elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
-	set(ZM_RUNDIR "/var/run/zoneminder")
-	set(ZM_TMPDIR "/var/run/zoneminder")
-	set(ZM_CONTENTDIR "/var/run/zoneminder")
-	set(ZM_LOGDIR "/var/log/zoneminder")
-	set(ZM_WEB_USER "wwwrun")
-	set(ZM_WEB_GROUP "www")
-	set(ZM_WEBDIR "/srv/www/htdocs/zoneminder")
-	set(ZM_CGIDIR "/srv/www/cgi-bin")
+  set(ZM_RUNDIR "/var/run/zoneminder")
+  set(ZM_TMPDIR "/var/run/zoneminder")
+  set(ZM_CONTENTDIR "/var/run/zoneminder")
+  set(ZM_LOGDIR "/var/log/zoneminder")
+  set(ZM_WEB_USER "wwwrun")
+  set(ZM_WEB_GROUP "www")
+  set(ZM_WEBDIR "/srv/www/htdocs/zoneminder")
+  set(ZM_CGIDIR "/srv/www/cgi-bin")
 elseif(ZM_TARGET_DISTRO STREQUAL "FreeBSD")
-	set(ZM_RUNDIR "/var/run/zm")
-        set(ZM_SOCKDIR "/var/run/zm")
-	set(ZM_TMPDIR "/var/tmp/zm")
-        set(ZM_CONTENTDIR "/usr/local/var/lib/zoneminder")
-        set(ZM_WEB_USER "www")
-        set(ZM_WEB_GROUP "www")
-        set(ZM_CONFIG_DIR "/usr/local/etc/zm")
-        set(ZM_CONFIG_SUBDIR "/usr/local/etc/zm/conf.d")
-        set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
-        set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
-        set(ZM_PERL_MM_PARMS "INSTALLDIRS=site")
-endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
+  set(ZM_RUNDIR "/var/run/zm")
+  set(ZM_SOCKDIR "/var/run/zm")
+  set(ZM_TMPDIR "/var/tmp/zm")
+  set(ZM_CONTENTDIR "/usr/local/var/lib/zoneminder")
+  set(ZM_WEB_USER "www")
+  set(ZM_WEB_GROUP "www")
+  set(ZM_CONFIG_DIR "/usr/local/etc/zm")
+  set(ZM_CONFIG_SUBDIR "/usr/local/etc/zm/conf.d")
+  set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
+  set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
+  set(ZM_PERL_MM_PARMS "INSTALLDIRS=site")
+endif()
 
 if(BUILD_MAN)
-	message(STATUS "Building man pages: Yes (default)")
-	set(ZM_PERL_MM_PARMS_FULL ${ZM_PERL_MM_PARMS})
+  message(STATUS "Building man pages: Yes (default)")
+  set(ZM_PERL_MM_PARMS_FULL ${ZM_PERL_MM_PARMS})
 else()
-	message(STATUS "Building man pages: No")
-	list(APPEND ZM_PERL_MM_PARMS_FULL ${ZM_PERL_MM_PARMS}
-		"INSTALLMAN1DIR=none"
-		"INSTALLMAN3DIR=none")
-endif(BUILD_MAN)
+  message(STATUS "Building man pages: No")
+  list(APPEND ZM_PERL_MM_PARMS_FULL ${ZM_PERL_MM_PARMS}
+    "INSTALLMAN1DIR=none"
+    "INSTALLMAN3DIR=none")
+endif()
 
 # Required for certain checks to work
-set(CMAKE_EXTRA_INCLUDE_FILES 
-    ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h
-    )
+set(CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h)
 # Required for including headers from the this folder
 include_directories("${CMAKE_BINARY_DIR}")
 # This is required to enable searching in lib64 (if exists), do not change
@@ -283,26 +275,26 @@ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
 
 # Set the systemd flag if systemd is autodetected or ZM_SYSTEMD has been set
 if(ZM_SYSTEMD OR (IS_DIRECTORY /usr/lib/systemd/system) OR (IS_DIRECTORY /lib/systemd/system))
-    set(WITH_SYSTEMD 1)
-endif(ZM_SYSTEMD OR (IS_DIRECTORY /usr/lib/systemd/system) OR (IS_DIRECTORY /lib/systemd/system))
+  set(WITH_SYSTEMD 1)
+endif()
 
 # System checks
 check_include_file("libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H)
 if(NOT HAVE_LIBV4L1_VIDEODEV_H)
-	check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
-endif(NOT HAVE_LIBV4L1_VIDEODEV_H)
+  check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
+endif()
 check_include_file("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
 check_include_file("execinfo.h" HAVE_EXECINFO_H)
-if (HAVE_EXECINFO_H)
+if(HAVE_EXECINFO_H)
   check_function_exists("backtrace" HAVE_DECL_BACKTRACE)
-  if (NOT HAVE_DECL_BACKTRACE)
-    find_library (EXECINFO_LIBRARY NAMES execinfo)
-    if (EXECINFO_LIBRARY)
-        list(APPEND ZM_BIN_LIBS "-lexecinfo")
-    endif (EXECINFO_LIBRARY)
-  endif (NOT HAVE_DECL_BACKTRACE)
+  if(NOT HAVE_DECL_BACKTRACE)
+    find_library(EXECINFO_LIBRARY NAMES execinfo)
+    if(EXECINFO_LIBRARY)
+      list(APPEND ZM_BIN_LIBS "-lexecinfo")
+    endif()
+  endif()
   check_function_exists("backtrace_symbols" HAVE_DECL_BACKTRACE_SYMBOLS)
-endif (HAVE_EXECINFO_H)
+endif()
 check_include_file("ucontext.h" HAVE_UCONTEXT_H)
 check_include_file("sys/sendfile.h" HAVE_SYS_SENDFILE_H)
 check_include_file("sys/syscall.h" HAVE_SYS_SYSCALL_H)
@@ -314,273 +306,269 @@ check_type_size("ucontext_t" HAVE_UCONTEXT_T)
 
 # *** LIBRARY CHECKS ***
 
-if (UNIX)
-    include (CheckLibraryExists)
-    CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
-    if(NOT HAVE_CLOCK_GETTIME)
-        message(FATAL_ERROR "clock_gettime not found")
-    else(NOT HAVE_CLOCK_GETTIME)
-        list(APPEND ZM_BIN_LIBS "-lrt")
-    endif(NOT HAVE_CLOCK_GETTIME)
-endif(UNIX)
+if(UNIX)
+  include(CheckLibraryExists)
+  CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
+  if(NOT HAVE_CLOCK_GETTIME)
+    message(FATAL_ERROR "clock_gettime not found")
+  else()
+    list(APPEND ZM_BIN_LIBS "-lrt")
+  endif()
+endif()
 
 # zlib
 find_package(ZLIB)
 if(ZLIB_FOUND)
-	set(HAVE_LIBZLIB 1)
-	list(APPEND ZM_BIN_LIBS "${ZLIB_LIBRARIES}")
-	include_directories("${ZLIB_INCLUDE_DIR}")
-	set(CMAKE_REQUIRED_INCLUDES "${ZLIB_INCLUDE_DIR}")
-	check_include_file("zlib.h" HAVE_ZLIB_H)
-	set(optlibsfound "${optlibsfound} zlib")
-else(ZLIB_FOUND)
-	set(optlibsnotfound "${optlibsnotfound} zlib")
-endif(ZLIB_FOUND)
+  set(HAVE_LIBZLIB 1)
+  list(APPEND ZM_BIN_LIBS "${ZLIB_LIBRARIES}")
+  include_directories("${ZLIB_INCLUDE_DIR}")
+  set(CMAKE_REQUIRED_INCLUDES "${ZLIB_INCLUDE_DIR}")
+  check_include_file("zlib.h" HAVE_ZLIB_H)
+  set(optlibsfound "${optlibsfound} zlib")
+else()
+  set(optlibsnotfound "${optlibsnotfound} zlib")
+endif()
 
 # Do not check for cURL if ZM_NO_CURL is on
 if(NOT ZM_NO_CURL)
-	# cURL
-	find_package(CURL)
-	if(CURL_FOUND)
-		set(HAVE_LIBCURL 1)
-		#list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
-		include_directories(${CURL_INCLUDE_DIRS})
-		set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
-		check_include_file("curl/curl.h" HAVE_CURL_CURL_H)
-		set(optlibsfound "${optlibsfound} cURL")
-	else(CURL_FOUND)
-		set(optlibsnotfound "${optlibsnotfound} cURL")
-	endif(CURL_FOUND)
-endif(NOT ZM_NO_CURL)
+  # cURL
+  find_package(CURL)
+  if(CURL_FOUND)
+    set(HAVE_LIBCURL 1)
+    #list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
+    include_directories(${CURL_INCLUDE_DIRS})
+    set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
+    check_include_file("curl/curl.h" HAVE_CURL_CURL_H)
+    set(optlibsfound "${optlibsfound} cURL")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} cURL")
+  endif()
+endif()
 
 # jpeg
 find_package(JPEG)
 if(JPEG_FOUND)
-	set(HAVE_LIBJPEG 1)
-	list(APPEND ZM_BIN_LIBS "${JPEG_LIBRARIES}")
-	#link_directories(${JPEG_LIBRARY})
-	include_directories("${JPEG_INCLUDE_DIR}")
-	set(CMAKE_REQUIRED_INCLUDES "${JPEG_INCLUDE_DIR}")
-	check_include_files("stdio.h;jpeglib.h" HAVE_JPEGLIB_H)
-	if(NOT HAVE_JPEGLIB_H)
-		message(FATAL_ERROR 
-                    "ZoneMinder requires libjpeg headers - check that libjpeg development packages are installed")
-	endif(NOT HAVE_JPEGLIB_H)
-else(JPEG_FOUND)
-	message(FATAL_ERROR 
-            "ZoneMinder requires jpeg but it was not found on your system")
-endif(JPEG_FOUND)
+  set(HAVE_LIBJPEG 1)
+  list(APPEND ZM_BIN_LIBS "${JPEG_LIBRARIES}")
+  #link_directories(${JPEG_LIBRARY})
+  include_directories("${JPEG_INCLUDE_DIR}")
+  set(CMAKE_REQUIRED_INCLUDES "${JPEG_INCLUDE_DIR}")
+  check_include_files("stdio.h;jpeglib.h" HAVE_JPEGLIB_H)
+  if(NOT HAVE_JPEGLIB_H)
+    message(FATAL_ERROR
+      "ZoneMinder requires libjpeg headers - check that libjpeg development packages are installed")
+  endif()
+else()
+  message(FATAL_ERROR
+    "ZoneMinder requires jpeg but it was not found on your system")
+endif()
 
 # LIBJWT
 find_package(LibJWT)
 if(LIBJWT_FOUND)
-	set(HAVE_LIBJWT 1)
-	set(optlibsfound "${optlibsfound} LIBJWT")
-	list(APPEND ZM_BIN_LIBS "${LIBJWT_LIBRARY}")
-else(LIBJWT_FOUND)
-	set(optlibsnotfound "${optlibsnotfound} LIBJWT")
-endif(LIBJWT_FOUND)
+  set(HAVE_LIBJWT 1)
+  set(optlibsfound "${optlibsfound} LIBJWT")
+  list(APPEND ZM_BIN_LIBS "${LIBJWT_LIBRARY}")
+else()
+  set(optlibsnotfound "${optlibsnotfound} LIBJWT")
+endif()
 
 # gnutls (using find_library and find_path)
 if(HAVE_LIBJWT)
-	find_library(GNUTLS_LIBRARIES gnutls)
-	if(GNUTLS_LIBRARIES)
-		set(HAVE_LIBGNUTLS 1)
-		list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
-		find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
-		if(GNUTLS_INCLUDE_DIR)
-			include_directories("${GNUTLS_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-		endif(GNUTLS_INCLUDE_DIR)
-		mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
-		check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
-		set(optlibsfound "${optlibsfound} GnuTLS")
-	else(GNUTLS_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} GnuTLS")
-	endif(GNUTLS_LIBRARIES)
-endif(HAVE_LIBJWT)
+  find_library(GNUTLS_LIBRARIES gnutls)
+  if(GNUTLS_LIBRARIES)
+    set(HAVE_LIBGNUTLS 1)
+    list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
+    find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
+    if(GNUTLS_INCLUDE_DIR)
+      include_directories("${GNUTLS_INCLUDE_DIR}")
+      set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
+    endif()
+    mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
+    check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
+    set(optlibsfound "${optlibsfound} GnuTLS")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} GnuTLS")
+  endif()
+endif()
 
 # OpenSSL
 if(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
-    find_package(OpenSSL)
-    if(OPENSSL_FOUND)
-        set(HAVE_LIBOPENSSL 1)
-        set(HAVE_LIBCRYPTO 1)
-        list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
-        include_directories("${OPENSSL_INCLUDE_DIR}")
-        set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-        check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
-        set(optlibsfound "${optlibsfound} OpenSSL")
-    else(OPENSSL_FOUND)
-        set(optlibsnotfound "${optlibsnotfound} OpenSSL")
-    endif(OPENSSL_FOUND)
-endif(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
+  find_package(OpenSSL)
+  if(OPENSSL_FOUND)
+    set(HAVE_LIBOPENSSL 1)
+    set(HAVE_LIBCRYPTO 1)
+    list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
+    include_directories("${OPENSSL_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+    check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
+    set(optlibsfound "${optlibsfound} OpenSSL")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} OpenSSL")
+  endif()
+endif()
 
 # pthread (using find_library and find_path)
 find_library(PTHREAD_LIBRARIES pthread)
 if(PTHREAD_LIBRARIES)
-	set(HAVE_LIBPTHREAD 1)
-	list(APPEND ZM_BIN_LIBS "${PTHREAD_LIBRARIES}")
-	find_path(PTHREAD_INCLUDE_DIR pthread.h)
-	if(PTHREAD_INCLUDE_DIR)
-		include_directories("${PTHREAD_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${PTHREAD_INCLUDE_DIR}")
-	endif(PTHREAD_INCLUDE_DIR)
-	mark_as_advanced(FORCE PTHREAD_LIBRARIES PTHREAD_INCLUDE_DIR)
-	check_include_file("pthread.h" HAVE_PTHREAD_H)
-	if(NOT HAVE_PTHREAD_H)
-		message(FATAL_ERROR 
-                    "ZoneMinder requires pthread headers - check that pthread development packages are installed")
-	endif(NOT HAVE_PTHREAD_H)
-else(PTHREAD_LIBRARIES)
-	message(FATAL_ERROR 
-            "ZoneMinder requires pthread but it was not found on your system")
-endif(PTHREAD_LIBRARIES)
+  set(HAVE_LIBPTHREAD 1)
+  list(APPEND ZM_BIN_LIBS "${PTHREAD_LIBRARIES}")
+  find_path(PTHREAD_INCLUDE_DIR pthread.h)
+  if(PTHREAD_INCLUDE_DIR)
+    include_directories("${PTHREAD_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${PTHREAD_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE PTHREAD_LIBRARIES PTHREAD_INCLUDE_DIR)
+  check_include_file("pthread.h" HAVE_PTHREAD_H)
+  if(NOT HAVE_PTHREAD_H)
+    message(FATAL_ERROR "ZoneMinder requires pthread headers - check that pthread development packages are installed")
+  endif()
+else()
+  message(FATAL_ERROR "ZoneMinder requires pthread but it was not found on your system")
+endif()
 
 # pcre (using find_library and find_path)
 find_library(PCRE_LIBRARIES pcre)
 if(PCRE_LIBRARIES)
-	set(HAVE_LIBPCRE 1)
-	list(APPEND ZM_BIN_LIBS "${PCRE_LIBRARIES}")
-	find_path(PCRE_INCLUDE_DIR pcre.h)
-	if(PCRE_INCLUDE_DIR)
-		include_directories("${PCRE_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${PCRE_INCLUDE_DIR}")
-	endif(PCRE_INCLUDE_DIR)
-	mark_as_advanced(FORCE PCRE_LIBRARIES PCRE_INCLUDE_DIR)
-	check_include_file("pcre.h" HAVE_PCRE_H)
-	set(optlibsfound "${optlibsfound} PCRE")
-else(PCRE_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} PCRE")
-endif(PCRE_LIBRARIES)
+  set(HAVE_LIBPCRE 1)
+  list(APPEND ZM_BIN_LIBS "${PCRE_LIBRARIES}")
+  find_path(PCRE_INCLUDE_DIR pcre.h)
+  if(PCRE_INCLUDE_DIR)
+    include_directories("${PCRE_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${PCRE_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE PCRE_LIBRARIES PCRE_INCLUDE_DIR)
+  check_include_file("pcre.h" HAVE_PCRE_H)
+  set(optlibsfound "${optlibsfound} PCRE")
+else()
+  set(optlibsnotfound "${optlibsnotfound} PCRE")
+endif()
 
 # gcrypt (using find_library and find_path)
 find_library(GCRYPT_LIBRARIES gcrypt)
 if(GCRYPT_LIBRARIES)
-	set(HAVE_LIBGCRYPT 1)
-	list(APPEND ZM_BIN_LIBS "${GCRYPT_LIBRARIES}")
-	find_path(GCRYPT_INCLUDE_DIR gcrypt.h)
-	if(GCRYPT_INCLUDE_DIR)
-		include_directories("${GCRYPT_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${GCRYPT_INCLUDE_DIR}")
-	endif(GCRYPT_INCLUDE_DIR)
-	mark_as_advanced(FORCE GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
-	check_include_file("gcrypt.h" HAVE_GCRYPT_H)
-	set(optlibsfound "${optlibsfound} GCrypt")
-else(GCRYPT_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} GCrypt")
-endif(GCRYPT_LIBRARIES)
+  set(HAVE_LIBGCRYPT 1)
+  list(APPEND ZM_BIN_LIBS "${GCRYPT_LIBRARIES}")
+  find_path(GCRYPT_INCLUDE_DIR gcrypt.h)
+  if(GCRYPT_INCLUDE_DIR)
+    include_directories("${GCRYPT_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${GCRYPT_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
+  check_include_file("gcrypt.h" HAVE_GCRYPT_H)
+  set(optlibsfound "${optlibsfound} GCrypt")
+else()
+  set(optlibsnotfound "${optlibsnotfound} GCrypt")
+endif()
 
 # mysqlclient (using find_library and find_path)
 find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
 if(MYSQLCLIENT_LIBRARIES)
-	set(HAVE_LIBMYSQLCLIENT 1)
-	list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
-	find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql)
-	if(MYSQLCLIENT_INCLUDE_DIR)
-		include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
-	endif(MYSQLCLIENT_INCLUDE_DIR)
-	mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
-	check_include_file("mysql.h" HAVE_MYSQL_H)
-	if(NOT HAVE_MYSQL_H)
-		message(FATAL_ERROR 
-                    "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
-	endif(NOT HAVE_MYSQL_H)
-else(MYSQLCLIENT_LIBRARIES)
-	message(FATAL_ERROR 
-            "ZoneMinder requires mysqlclient but it was not found on your system")
-endif(MYSQLCLIENT_LIBRARIES)
+  set(HAVE_LIBMYSQLCLIENT 1)
+  list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
+  find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql)
+  if(MYSQLCLIENT_INCLUDE_DIR)
+    include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
+  check_include_file("mysql.h" HAVE_MYSQL_H)
+  if(NOT HAVE_MYSQL_H)
+    message(FATAL_ERROR "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
+  endif()
+else()
+  message(FATAL_ERROR "ZoneMinder requires mysqlclient but it was not found on your system")
+endif()
 
 set(PATH_FFMPEG "")
 set(OPT_FFMPEG "no")
 # avformat (using find_library and find_path)
 find_library(AVFORMAT_LIBRARIES avformat)
 if(AVFORMAT_LIBRARIES)
-	set(HAVE_LIBAVFORMAT 1)
-	list(APPEND ZM_BIN_LIBS "${AVFORMAT_LIBRARIES}")
-	find_path(AVFORMAT_INCLUDE_DIR "libavformat/avformat.h" /usr/include/ffmpeg)
-	if(AVFORMAT_INCLUDE_DIR)
-		include_directories("${AVFORMAT_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${AVFORMAT_INCLUDE_DIR}")
-	endif(AVFORMAT_INCLUDE_DIR)
-	mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR)
-	check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
-	set(optlibsfound "${optlibsfound} AVFormat")
-else(AVFORMAT_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} AVFormat")
-endif(AVFORMAT_LIBRARIES)
+  set(HAVE_LIBAVFORMAT 1)
+  list(APPEND ZM_BIN_LIBS "${AVFORMAT_LIBRARIES}")
+  find_path(AVFORMAT_INCLUDE_DIR "libavformat/avformat.h" /usr/include/ffmpeg)
+  if(AVFORMAT_INCLUDE_DIR)
+    include_directories("${AVFORMAT_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${AVFORMAT_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR)
+  check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
+  set(optlibsfound "${optlibsfound} AVFormat")
+else()
+  set(optlibsnotfound "${optlibsnotfound} AVFormat")
+endif()
 
 # avcodec (using find_library and find_path)
 find_library(AVCODEC_LIBRARIES avcodec)
 if(AVCODEC_LIBRARIES)
-	set(HAVE_LIBAVCODEC 1)
-	list(APPEND ZM_BIN_LIBS "${AVCODEC_LIBRARIES}")
-	find_path(AVCODEC_INCLUDE_DIR "libavcodec/avcodec.h" /usr/include/ffmpeg)
-	if(AVCODEC_INCLUDE_DIR)
-		include_directories("${AVCODEC_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${AVCODEC_INCLUDE_DIR}")
-	endif(AVCODEC_INCLUDE_DIR)
-	mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR)
-	check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
-	set(optlibsfound "${optlibsfound} AVCodec")
-else(AVCODEC_LIBRARIES)
+  set(HAVE_LIBAVCODEC 1)
+  list(APPEND ZM_BIN_LIBS "${AVCODEC_LIBRARIES}")
+  find_path(AVCODEC_INCLUDE_DIR "libavcodec/avcodec.h" /usr/include/ffmpeg)
+  if(AVCODEC_INCLUDE_DIR)
+    include_directories("${AVCODEC_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${AVCODEC_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR)
+  check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
+  set(optlibsfound "${optlibsfound} AVCodec")
+else()
   message(WARNING "\nWhile it should be possible to build ZM without AVCODEC the result will pretty useless.")
-	set(optlibsnotfound "${optlibsnotfound} AVCodec")
-endif(AVCODEC_LIBRARIES)
+  set(optlibsnotfound "${optlibsnotfound} AVCodec")
+endif()
 
 # avdevice (using find_library and find_path)
 find_library(AVDEVICE_LIBRARIES avdevice)
 if(AVDEVICE_LIBRARIES)
-	set(HAVE_LIBAVDEVICE 1)
-	list(APPEND ZM_BIN_LIBS "${AVDEVICE_LIBRARIES}")
-	find_path(AVDEVICE_INCLUDE_DIR "libavdevice/avdevice.h" /usr/include/ffmpeg)
-	if(AVDEVICE_INCLUDE_DIR)
-		include_directories("${AVDEVICE_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${AVDEVICE_INCLUDE_DIR}")
-	endif(AVDEVICE_INCLUDE_DIR)
-	mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR)
-	check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
-	set(optlibsfound "${optlibsfound} AVDevice")
-else(AVDEVICE_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} AVDevice")
-endif(AVDEVICE_LIBRARIES)
+  set(HAVE_LIBAVDEVICE 1)
+  list(APPEND ZM_BIN_LIBS "${AVDEVICE_LIBRARIES}")
+  find_path(AVDEVICE_INCLUDE_DIR "libavdevice/avdevice.h" /usr/include/ffmpeg)
+  if(AVDEVICE_INCLUDE_DIR)
+    include_directories("${AVDEVICE_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${AVDEVICE_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR)
+  check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
+  set(optlibsfound "${optlibsfound} AVDevice")
+else()
+  set(optlibsnotfound "${optlibsnotfound} AVDevice")
+endif()
 
 # avutil (using find_library and find_path)
 find_library(AVUTIL_LIBRARIES avutil)
 if(AVUTIL_LIBRARIES)
-	set(HAVE_LIBAVUTIL 1)
-	list(APPEND ZM_BIN_LIBS "${AVUTIL_LIBRARIES}")
-	find_path(AVUTIL_INCLUDE_DIR "libavutil/avutil.h" /usr/include/ffmpeg)
-	if(AVUTIL_INCLUDE_DIR)
-		include_directories("${AVUTIL_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${AVUTIL_INCLUDE_DIR}")
-	endif(AVUTIL_INCLUDE_DIR)
-	mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR)
-	check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
-	check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
-	check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
-	set(optlibsfound "${optlibsfound} AVUtil")
-else(AVUTIL_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} AVUtil")
-endif(AVUTIL_LIBRARIES)
+  set(HAVE_LIBAVUTIL 1)
+  list(APPEND ZM_BIN_LIBS "${AVUTIL_LIBRARIES}")
+  find_path(AVUTIL_INCLUDE_DIR "libavutil/avutil.h" /usr/include/ffmpeg)
+  if(AVUTIL_INCLUDE_DIR)
+    include_directories("${AVUTIL_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${AVUTIL_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR)
+  check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
+  check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
+  check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
+  set(optlibsfound "${optlibsfound} AVUtil")
+else()
+  set(optlibsnotfound "${optlibsnotfound} AVUtil")
+endif()
 
 # swscale (using find_library and find_path)
 find_library(SWSCALE_LIBRARIES swscale)
 if(SWSCALE_LIBRARIES)
-	set(HAVE_LIBSWSCALE 1)
-	list(APPEND ZM_BIN_LIBS "${SWSCALE_LIBRARIES}")
-	find_path(SWSCALE_INCLUDE_DIR "libswscale/swscale.h" /usr/include/ffmpeg)
-	if(SWSCALE_INCLUDE_DIR)
-		include_directories("${SWSCALE_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${SWSCALE_INCLUDE_DIR}")
-	endif(SWSCALE_INCLUDE_DIR)
-	mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR)
-	check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
-	set(optlibsfound "${optlibsfound} SWScale")
-else(SWSCALE_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} SWScale")
-endif(SWSCALE_LIBRARIES)
+  set(HAVE_LIBSWSCALE 1)
+  list(APPEND ZM_BIN_LIBS "${SWSCALE_LIBRARIES}")
+  find_path(SWSCALE_INCLUDE_DIR "libswscale/swscale.h" /usr/include/ffmpeg)
+  if(SWSCALE_INCLUDE_DIR)
+    include_directories("${SWSCALE_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${SWSCALE_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR)
+  check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
+  set(optlibsfound "${optlibsfound} SWScale")
+else()
+  set(optlibsnotfound "${optlibsnotfound} SWScale")
+endif()
 
 # SWresample (using find_library and find_path)
 find_library(SWRESAMPLE_LIBRARIES swresample)
@@ -591,11 +579,11 @@ if(SWRESAMPLE_LIBRARIES)
   if(SWRESAMPLE_INCLUDE_DIR)
     include_directories("${SWRESAMPLE_INCLUDE_DIR}")
     set(CMAKE_REQUIRED_INCLUDES "${SWRESAMPLE_INCLUDE_DIR}")
-  endif(SWRESAMPLE_INCLUDE_DIR)
+  endif()
   mark_as_advanced(FORCE SWRESAMPLE_LIBRARIES SWRESAMPLE_INCLUDE_DIR)
   check_include_file("libswresample/swresample.h" HAVE_LIBSWRESAMPLE_SWRESAMPLE_H)
   set(optlibsfound "${optlibsfound} SWResample")
-else(SWRESAMPLE_LIBRARIES)
+else()
   set(optlibsnotfound "${optlibsnotfound} SWResample")
 
   # AVresample (using find_library and find_path)
@@ -607,70 +595,69 @@ else(SWRESAMPLE_LIBRARIES)
     if(AVRESAMPLE_INCLUDE_DIR)
       include_directories("${AVRESAMPLE_INCLUDE_DIR}")
       set(CMAKE_REQUIRED_INCLUDES "${AVRESAMPLE_INCLUDE_DIR}")
-    endif(AVRESAMPLE_INCLUDE_DIR)
+    endif()
     mark_as_advanced(FORCE AVRESAMPLE_LIBRARIES AVRESAMPLE_INCLUDE_DIR)
     check_include_file("libavresample/avresample.h" HAVE_LIBAVRESAMPLE_AVRESAMPLE_H)
     set(optlibsfound "${optlibsfound} AVResample")
-  else(AVRESAMPLE_LIBRARIES)
+  else()
     set(optlibsnotfound "${optlibsnotfound} AVResample")
-  endif(AVRESAMPLE_LIBRARIES)
-
-endif(SWRESAMPLE_LIBRARIES)
+  endif()
+endif()
 
 # Find the path to the ffmpeg executable
-find_program(FFMPEG_EXECUTABLE 
-	NAMES ffmpeg avconv
-	PATH_SUFFIXES ffmpeg)
+find_program(FFMPEG_EXECUTABLE
+  NAMES ffmpeg avconv
+  PATH_SUFFIXES ffmpeg)
 if(FFMPEG_EXECUTABLE)
-	set(PATH_FFMPEG "${FFMPEG_EXECUTABLE}")
-	set(OPT_FFMPEG "yes")
-	mark_as_advanced(FFMPEG_EXECUTABLE)
-endif(FFMPEG_EXECUTABLE)
+  set(PATH_FFMPEG "${FFMPEG_EXECUTABLE}")
+  set(OPT_FFMPEG "yes")
+  mark_as_advanced(FFMPEG_EXECUTABLE)
+endif()
 
 # Do not check for libvlc if ZM_NO_LIBVLC is on
 if(NOT ZM_NO_LIBVLC)
-	# libvlc (using find_library and find_path)
-	find_library(LIBVLC_LIBRARIES vlc)
-	if(LIBVLC_LIBRARIES)
-		set(HAVE_LIBVLC 1)
-		#list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
-		find_path(LIBVLC_INCLUDE_DIR "vlc/vlc.h")
-		if(LIBVLC_INCLUDE_DIR)
-			include_directories("${LIBVLC_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${LIBVLC_INCLUDE_DIR}")
-		endif(LIBVLC_INCLUDE_DIR)
-		mark_as_advanced(FORCE LIBVLC_LIBRARIES LIBVLC_INCLUDE_DIR)
-		check_include_file("vlc/vlc.h" HAVE_VLC_VLC_H)
-		set(optlibsfound "${optlibsfound} libVLC")
-	else(LIBVLC_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} libVLC")
-	endif(LIBVLC_LIBRARIES)
-endif(NOT ZM_NO_LIBVLC)
+  # libvlc (using find_library and find_path)
+  find_library(LIBVLC_LIBRARIES vlc)
+  if(LIBVLC_LIBRARIES)
+    set(HAVE_LIBVLC 1)
+    #list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
+    find_path(LIBVLC_INCLUDE_DIR "vlc/vlc.h")
+    if(LIBVLC_INCLUDE_DIR)
+      include_directories("${LIBVLC_INCLUDE_DIR}")
+      set(CMAKE_REQUIRED_INCLUDES "${LIBVLC_INCLUDE_DIR}")
+    endif()
+    mark_as_advanced(FORCE LIBVLC_LIBRARIES LIBVLC_INCLUDE_DIR)
+    check_include_file("vlc/vlc.h" HAVE_VLC_VLC_H)
+    set(optlibsfound "${optlibsfound} libVLC")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} libVLC")
+  endif()
+endif()
 
 if(NOT ZM_NO_LIBVNC)
-	# libvncclient (using find_library and find_path)
-	find_library(LIBVNC_LIBRARIES vncclient)
-	if(LIBVNC_LIBRARIES)
-		set(HAVE_LIBVNC 1)
-		#list(APPEND ZM_BIN_LIBS "${LIBVNC_LIBRARIES}")
-		find_path(LIBVNC_INCLUDE_DIR "rfb/rfb.h")
-		if(LIBVNC_INCLUDE_DIR)
-			include_directories("${LIBVNC_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${LIBVNC_INCLUDE_DIR}")
-		endif(LIBVNC_INCLUDE_DIR)
-		mark_as_advanced(FORCE LIBVNC_LIBRARIES LIBVNC_INCLUDE_DIR)
-		check_include_file("rfb/rfb.h" HAVE_RFB_RFB_H)
-		set(optlibsfound "${optlibsfound} libVNC")
-	else(LIBVNC_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} libVNC")
-	endif(LIBVNC_LIBRARIES)
-endif(NOT ZM_NO_LIBVNC)
+  # libvncclient (using find_library and find_path)
+  find_library(LIBVNC_LIBRARIES vncclient)
+  if(LIBVNC_LIBRARIES)
+    set(HAVE_LIBVNC 1)
+    #list(APPEND ZM_BIN_LIBS "${LIBVNC_LIBRARIES}")
+    find_path(LIBVNC_INCLUDE_DIR "rfb/rfb.h")
+    if(LIBVNC_INCLUDE_DIR)
+      include_directories("${LIBVNC_INCLUDE_DIR}")
+      set(CMAKE_REQUIRED_INCLUDES "${LIBVNC_INCLUDE_DIR}")
+    endif()
+    mark_as_advanced(FORCE LIBVNC_LIBRARIES LIBVNC_INCLUDE_DIR)
+    check_include_file("rfb/rfb.h" HAVE_RFB_RFB_H)
+    set(optlibsfound "${optlibsfound} libVNC")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} libVNC")
+  endif()
+endif()
 
 #find_package(Boost 1.36.0)
 #if(Boost_FOUND)
-  #include_directories(${Boost_INCLUDE_DIRS})
-  ##set(CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIRS}")
-  #list(APPEND ZM_BIN_LIBS "${Boost_LIBRARIES}")
+#include_directories(${Boost_INCLUDE_DIRS})
+##set(CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIRS}")
+#list(APPEND ZM_BIN_LIBS "${Boost_LIBRARIES}")
 #endif()
 
 if(NOT ZM_NO_RTSPSERVER)
@@ -681,22 +668,21 @@ if(NOT ZM_NO_RTSPSERVER)
     list(APPEND ZM_BIN_LIBS "${Live555_LIBRARIES}")
     set(HAVE_RTSP_SERVER 1)
     set(optlibsfound "${optlibsfound} libLive555")
-  else(Live555_FOUND)
+  else()
     set(HAVE_RTSP_SERVER 0)
     set(optlibsnotfound "${optlibsnotfound} libLive555")
-  endif(Live555_FOUND)
-else(NOT ZM_NO_RTSPSERVER)
+  endif()
+else()
   set(HAVE_RTSP_SERVER 0)
-endif(NOT ZM_NO_RTSPSERVER)
+endif()
 
 #
 # *** END OF LIBRARY CHECKS ***
 
 # Check for gnutls or crypto
 if((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
-	message(FATAL_ERROR 
-            "ZoneMinder requires crypto or gnutls but none were found on your system")
-endif((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
+  message(FATAL_ERROR "ZoneMinder requires crypto or gnutls but none were found on your system")
+endif()
 
 # Check for V4L header files and enable ZM_HAS_V4L, ZM_HAS_V4L1, ZM_HAS_V4L2 accordingly
 # Setting to zeros first is required because ZM uses #define for these
@@ -704,150 +690,144 @@ set(ZM_HAS_V4L 0)
 set(ZM_HAS_V4L1 0)
 set(ZM_HAS_V4L2 0)
 if(HAVE_LINUX_VIDEODEV_H OR HAVE_LIBV4L1_VIDEODEV_H)
-	set(ZM_HAS_V4L 1)
-	set(ZM_HAS_V4L1 1)
-endif(HAVE_LINUX_VIDEODEV_H OR HAVE_LIBV4L1_VIDEODEV_H)
+  set(ZM_HAS_V4L 1)
+  set(ZM_HAS_V4L1 1)
+endif()
 if(HAVE_LINUX_VIDEODEV2_H)
-	set(ZM_HAS_V4L 1)
-	set(ZM_HAS_V4L2 1)
-endif(HAVE_LINUX_VIDEODEV2_H)
-if((NOT HAVE_LINUX_VIDEODEV_H) 
-    AND (NOT HAVE_LIBV4L1_VIDEODEV_H) 
-    AND (NOT HAVE_LINUX_VIDEODEV2_H))
-	message(AUTHOR_WARNING 
-            "Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
-endif((NOT HAVE_LINUX_VIDEODEV_H) 
-    AND (NOT HAVE_LIBV4L1_VIDEODEV_H) 
-    AND (NOT HAVE_LINUX_VIDEODEV2_H))
+  set(ZM_HAS_V4L 1)
+  set(ZM_HAS_V4L2 1)
+endif()
+if((NOT HAVE_LINUX_VIDEODEV_H)
+  AND (NOT HAVE_LIBV4L1_VIDEODEV_H)
+  AND (NOT HAVE_LINUX_VIDEODEV2_H))
+  message(AUTHOR_WARNING "Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
+endif()
 # Check for PCRE and enable ZM_PCRE accordingly
 set(ZM_PCRE 0)
 if(HAVE_LIBPCRE AND HAVE_PCRE_H)
-	set(ZM_PCRE 1)
-endif(HAVE_LIBPCRE AND HAVE_PCRE_H)
+  set(ZM_PCRE 1)
+endif()
 # Check for mmap and enable in all components
 set(ZM_MEM_MAPPED 0)
 set(ENABLE_MMAP no)
 if(NOT ZM_NO_MMAP)
-	set(ZM_MEM_MAPPED 1)
-	set(ENABLE_MMAP yes)
-	set(ZM_MMAP_PERLPACKAGE "Sys::Mmap")
-endif(NOT ZM_NO_MMAP)
+  set(ZM_MEM_MAPPED 1)
+  set(ENABLE_MMAP yes)
+  set(ZM_MMAP_PERLPACKAGE "Sys::Mmap")
+endif()
 
 # Check for the ONVIF flag and enable ZM_HAS_ONVIF accordingly
 set(ZM_HAS_ONVIF 0)
 if(ZM_ONVIF)
-	set(ZM_HAS_ONVIF 1)
-endif(ZM_ONVIF)
+  set(ZM_HAS_ONVIF 1)
+endif()
 
 # Check for authentication functions
 if(HAVE_OPENSSL_MD5_H)
-	set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
-	set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-	check_prototype_definition(
-            MD5 
-            "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h" 
-            HAVE_MD5_OPENSSL)
-endif(HAVE_OPENSSL_MD5_H)
+  set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
+  set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+  check_prototype_definition(
+    MD5
+    "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h"
+    HAVE_MD5_OPENSSL)
+endif()
 
 if(HAVE_GNUTLS_GNUTLS_H)
-	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
-	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-	check_prototype_definition(
-            gnutls_fingerprint 
-            "int gnutls_fingerprint (gnutls_digest_algorithm_t algo, const gnutls_datum_t * data, void *result, size_t * result_size)" "0" "stdlib.h;gnutls/gnutls.h" 
-            HAVE_DECL_GNUTLS_FINGERPRINT)
-endif(HAVE_GNUTLS_GNUTLS_H)
+  set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
+  set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
+  check_prototype_definition(
+    gnutls_fingerprint
+    "int gnutls_fingerprint (gnutls_digest_algorithm_t algo, const gnutls_datum_t * data, void *result, size_t * result_size)" "0" "stdlib.h;gnutls/gnutls.h"
+    HAVE_DECL_GNUTLS_FINGERPRINT)
+endif()
 
 if(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
-	set(HAVE_DECL_MD5 1)
-endif(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
+  set(HAVE_DECL_MD5 1)
+endif()
 
 if((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
-	message(AUTHOR_WARNING 
-        "ZoneMinder requires a working MD5 function for hashed authentication but 
-        none were found - hashed authentication will not be available")
-endif((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
+  message(AUTHOR_WARNING
+    "ZoneMinder requires a working MD5 function for hashed authentication but
+     none were found - hashed authentication will not be available")
+endif()
 
 # Dirty fix for zm_user only using openssl's md5 if gnutls and gcrypt are not available.
 # This needs to be fixed in zm_user.[h,cpp] but such fix will also require changes to configure.ac
 if(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
-	set(HAVE_GCRYPT_H 0)
-	set(HAVE_GNUTLS_OPENSSL_H 0)
-endif(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
+  set(HAVE_GCRYPT_H 0)
+  set(HAVE_GNUTLS_OPENSSL_H 0)
+endif()
 
 # Check for Perl
 find_package(Perl)
 if(NOT PERL_FOUND)
-	message(FATAL_ERROR 
-            "ZoneMinder requires Perl 5.6.0 or newer but it was not found on your system")
-endif(NOT PERL_FOUND)
+  message(FATAL_ERROR "ZoneMinder requires Perl 5.6.0 or newer but it was not found on your system")
+endif()
 
 # Checking for perl modules requires FindPerlModules.cmake
 # Check all required modules at once
 # TODO: Add checking for the optional modules
 find_package(
-    PerlModules COMPONENTS Sys::Syslog DBI DBD::mysql 
-    Getopt::Long Time::HiRes Date::Manip LWP::UserAgent 
-    ExtUtils::MakeMaker ${ZM_MMAP_PERLPACKAGE})
+  PerlModules COMPONENTS Sys::Syslog DBI DBD::mysql
+  Getopt::Long Time::HiRes Date::Manip LWP::UserAgent
+  ExtUtils::MakeMaker ${ZM_MMAP_PERLPACKAGE})
 if(NOT PERLMODULES_FOUND)
-  message(WARNING
-            "Not all required perl modules were found on your system")
-endif(NOT PERLMODULES_FOUND)
+  message(WARNING "Not all required perl modules were found on your system")
+endif()
 
 # Attempt to check which user apache (or other web server) runs on by 
 # searching for a user beginning with apache or www and then cutting the user 
 # from the first matching user line
 if(ZM_WEB_USER STREQUAL "")
-	# Check for a user matching ^apache and cut the username from the 
-        # userline in the first match
-	file(STRINGS "/etc/passwd" userline_apache REGEX "^apache")
-	file(STRINGS "/etc/passwd" userline_www REGEX "^www")
-	if(NOT (userline_apache STREQUAL ""))
-		execute_process(
-                    COMMAND echo ${userline_apache} 
-                    COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER 
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-	elseif(NOT (userline_www STREQUAL ""))
-		execute_process(
-                    COMMAND echo ${userline_www} 
-                    COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER 
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-	endif(NOT (userline_apache STREQUAL ""))
-	message(STATUS "Detected web server user: ${ZM_WEB_USER}")
-endif(ZM_WEB_USER STREQUAL "")
+  # Check for a user matching ^apache and cut the username from the
+  # userline in the first match
+  file(STRINGS "/etc/passwd" userline_apache REGEX "^apache")
+  file(STRINGS "/etc/passwd" userline_www REGEX "^www")
+  if(NOT (userline_apache STREQUAL ""))
+    execute_process(
+      COMMAND echo ${userline_apache}
+      COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  elseif(NOT (userline_www STREQUAL ""))
+    execute_process(
+      COMMAND echo ${userline_www}
+      COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif()
+  message(STATUS "Detected web server user: ${ZM_WEB_USER}")
+endif()
 # Check if webgroup contains anything. If not, use the web user as the web group
 if(NOT ZM_WEB_GROUP)
-	set(ZM_WEB_GROUP ${ZM_WEB_USER})
-endif(NOT ZM_WEB_GROUP)
+  set(ZM_WEB_GROUP ${ZM_WEB_USER})
+endif()
 message(STATUS "Using web user: ${ZM_WEB_USER}")
 message(STATUS "Using web group: ${ZM_WEB_GROUP}")
 
 if(WITH_SYSTEMD)
-    # Check for polkit
-    find_package(Polkit)
-    if(NOT POLKIT_FOUND)
-      message(WARNING
-                "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
-    endif(NOT POLKIT_FOUND)
-endif(WITH_SYSTEMD)
+  # Check for polkit
+  find_package(Polkit)
+  if(NOT POLKIT_FOUND)
+    message(WARNING "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
+  endif()
+endif()
 
 # Find the path to an arp compatible executable
 if(ZM_PATH_ARP STREQUAL "")
-    find_program(ARP_EXECUTABLE arp)
+  find_program(ARP_EXECUTABLE arp)
+  if(ARP_EXECUTABLE)
+    set(ZM_PATH_ARP "${ARP_EXECUTABLE}")
+    mark_as_advanced(ARP_EXECUTABLE)
+  else()
+    find_program(ARP_EXECUTABLE ip)
     if(ARP_EXECUTABLE)
-        set(ZM_PATH_ARP "${ARP_EXECUTABLE}")
-        mark_as_advanced(ARP_EXECUTABLE)
-    else(ARP_EXECUTABLE)
-        find_program(ARP_EXECUTABLE ip)
-            if(ARP_EXECUTABLE)
-                set(ZM_PATH_ARP "${ARP_EXECUTABLE} neigh")
-                mark_as_advanced(ARP_EXECUTABLE)
-            endif(ARP_EXECUTABLE)
-    endif(ARP_EXECUTABLE)
-    if(ARP_EXECUTABLE-NOTFOUND)
-        message(WARNING "Unable to find a compatible arp binary. Monitor probe will not function." )
-    endif(ARP_EXECUTABLE-NOTFOUND)
-endif(ZM_PATH_ARP STREQUAL "")
+      set(ZM_PATH_ARP "${ARP_EXECUTABLE} neigh")
+      mark_as_advanced(ARP_EXECUTABLE)
+    endif()
+  endif()
+  if(ARP_EXECUTABLE-NOTFOUND)
+    message(WARNING "Unable to find a compatible arp binary. Monitor probe will not function.")
+  endif()
+endif()
 
 # Some variables that zm expects
 set(ZM_PID "${ZM_RUNDIR}/zm.pid")
@@ -864,15 +844,15 @@ set(WEB_USER "${ZM_WEB_USER}")
 set(WEB_GROUP "${ZM_WEB_GROUP}")
 set(ZM_DB_TYPE "mysql")
 if(ZM_PERL_SEARCH_PATH)
-	set(EXTRA_PERL_LIB "use lib '${ZM_PERL_SEARCH_PATH}'; # Include custom perl install path")
-else(ZM_PERL_SEARCH_PATH)
-	set(EXTRA_PERL_LIB "# Include from system perl paths only")
-endif(ZM_PERL_SEARCH_PATH)
+  set(EXTRA_PERL_LIB "use lib '${ZM_PERL_SEARCH_PATH}'; # Include custom perl install path")
+else()
+  set(EXTRA_PERL_LIB "# Include from system perl paths only")
+endif()
 
 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf.d" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf.d" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif()
 
 # Generate files from the .in files
 configure_file(zm.conf.in "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" @ONLY)
@@ -901,21 +881,21 @@ add_subdirectory(misc)
 add_subdirectory(onvif)
 
 if(BUILD_TEST_SUITE)
-	message("Building unit tests: Yes")
-	find_package(Catch2 REQUIRED)
+  message("Building unit tests: Yes")
+  find_package(Catch2 REQUIRED)
 
-	include(CTest)
-	add_subdirectory(tests)
+  include(CTest)
+  add_subdirectory(tests)
 else()
-	message("Building unit tests: No (default)")
-endif(BUILD_TEST_SUITE)
+  message("Building unit tests: No (default)")
+endif()
 
 # Process distro subdirectories
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
-	add_subdirectory(distros/redhat)
-elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
-	add_subdirectory(distros/opensuse)
-endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
+  add_subdirectory(distros/redhat)
+elseif()
+  add_subdirectory(distros/opensuse)
+endif()
 
 # Print optional libraries detection status
 message(STATUS "Optional libraries found:${optlibsfound}")
@@ -923,14 +903,12 @@ message(STATUS "Optional libraries not found:${optlibsnotfound}")
 
 # Run ZM configuration generator
 message(STATUS "Running ZoneMinder configuration generator")
-execute_process(COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
-if(zmconfgen_result EQUAL 0)
-	message(STATUS 
-            "ZoneMinder configuration generator completed successfully")
-else(zmconfgen_result EQUAL 0)
-	message(FATAL_ERROR 
-            "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
-endif(zmconfgen_result EQUAL 0)
+execute_process(COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/zmconfgen.pl RESULT_VARIABLE ZMCONFGEN_RESULT)
+if(ZMCONFGEN_RESULT EQUAL 0)
+  message(STATUS "ZoneMinder configuration generator completed successfully")
+else()
+  message(FATAL_ERROR "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
+endif()
 
 # Install zm.conf
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
@@ -938,17 +916,17 @@ install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/conf.d/" DESTINATION "${ZM_CONFIG
 
 # Uninstall target
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
 add_custom_target(uninstall
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake)
+  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake)
 
 # Configure CCache if available
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif(CCACHE_FOUND)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif()
 
 install(DIRECTORY icons DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/")
diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt
index 45cafe57d..e3e05c54e 100644
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -7,12 +7,12 @@
 
 # Display a message to show the RHEL build options are being processed.
 if(ZM_TARGET_DISTRO MATCHES "^el")
-    message([STATUS] "Starting RHEL Build Options" ...)
+  message([STATUS] "Starting RHEL Build Options" ...)
 elseif(ZM_TARGET_DISTRO MATCHES "^fc")
-    message([STATUS] "Starting Fedora Build Options" ...)
-else(ZM_TARGET_DISTRO MATCHES "^el")
-    message([WARNING] "Unknown Build Option Detected" ...)
-endif(ZM_TARGET_DISTRO MATCHES "^el")
+  message([STATUS] "Starting Fedora Build Options" ...)
+else()
+  message([WARNING] "Unknown Build Option Detected" ...)
+endif()
 
 #
 # CONFIGURE STAGE
diff --git a/fonts/CMakeLists.txt b/fonts/CMakeLists.txt
index aa00d14db..0d54e8174 100644
--- a/fonts/CMakeLists.txt
+++ b/fonts/CMakeLists.txt
@@ -2,4 +2,3 @@
 file(GLOB fontfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.zmfnt")
 # Install the fonts
 install(FILES ${fontfileslist} DESTINATION "${ZM_FONTDIR}")
-
diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
index f794241a8..e51636771 100644
--- a/misc/CMakeLists.txt
+++ b/misc/CMakeLists.txt
@@ -17,7 +17,8 @@ configure_file(zm-sudo.in "${CMAKE_CURRENT_BINARY_DIR}/zm-sudo" @ONLY)
 
 # Install Policykit rules and actions into the proper folders only on systems with systemd
 if(WITH_SYSTEMD)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
-endif(WITH_SYSTEMD)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
+endif()
+
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zoneminder.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
diff --git a/onvif/modules/CMakeLists.txt b/onvif/modules/CMakeLists.txt
index 5cabfc7ef..502970af9 100644
--- a/onvif/modules/CMakeLists.txt
+++ b/onvif/modules/CMakeLists.txt
@@ -2,9 +2,9 @@
 
 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif()
 
 # MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
diff --git a/onvif/proxy/CMakeLists.txt b/onvif/proxy/CMakeLists.txt
index 7d7ec664a..779b4d47e 100644
--- a/onvif/proxy/CMakeLists.txt
+++ b/onvif/proxy/CMakeLists.txt
@@ -2,9 +2,9 @@
 
 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif()
 
 # MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 1ed322deb..79df1f03a 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -22,8 +22,8 @@ configure_file(zmcamtool.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" @ONLY)
 configure_file(zmsystemctl.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" @ONLY)
 configure_file(zmtelemetry.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" @ONLY)
 if(NOT ZM_NO_X10)
-	configure_file(zmx10.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" @ONLY)
-endif(NOT ZM_NO_X10)
+  configure_file(zmx10.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" @ONLY)
+endif()
 #configure_file(zmdbbackup.in zmdbbackup @ONLY)
 #configure_file(zmdbrestore.in zmdbrestore @ONLY)
 configure_file(zm.in "${CMAKE_CURRENT_BINARY_DIR}/zm" @ONLY)
@@ -32,14 +32,14 @@ configure_file(zm.in "${CMAKE_CURRENT_BINARY_DIR}/zm" @ONLY)
 # Generate man files for the perl scripts destined for the bin folder
 if(BUILD_MAN)
   file(GLOB perlscripts "${CMAKE_CURRENT_BINARY_DIR}/*.pl")
-  FOREACH(PERLSCRIPT ${perlscripts})
+  foreach(PERLSCRIPT ${perlscripts})
     get_filename_component(PERLSCRIPTNAME ${PERLSCRIPT} NAME)
     POD2MAN(${PERLSCRIPT} ${PERLSCRIPTNAME} 8 ${ZM_MANPAGE_DEST_PREFIX})
-  ENDFOREACH(PERLSCRIPT ${perlscripts})
-endif(BUILD_MAN)
+  endforeach(PERLSCRIPT ${perlscripts})
+endif()
 
 # Install the perl scripts
-install(FILES 
+install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl"
   "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl"
   "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl"
@@ -58,9 +58,9 @@ install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/zmstats.pl"
   DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 if(NOT ZM_NO_X10)
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-endif(NOT ZM_NO_X10)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+endif()
 
 if(WITH_SYSTEMD)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-endif(WITH_SYSTEMD)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+endif()
diff --git a/scripts/ZoneMinder/CMakeLists.txt b/scripts/ZoneMinder/CMakeLists.txt
index a5914f0e0..2a8708d2f 100644
--- a/scripts/ZoneMinder/CMakeLists.txt
+++ b/scripts/ZoneMinder/CMakeLists.txt
@@ -2,14 +2,14 @@
 
 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Changes" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/MANIFEST" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/META.yml" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/README" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/t" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Changes" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/MANIFEST" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/META.yml" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/README" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/t" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif()
 
 # Create files from the .in files
 configure_file(lib/ZoneMinder/Base.pm.in "${CMAKE_CURRENT_BINARY_DIR}/lib/ZoneMinder/Base.pm" @ONLY)
@@ -19,10 +19,10 @@ configure_file(lib/ZoneMinder/ConfigData.pm.in "${CMAKE_CURRENT_BINARY_DIR}/lib/
 configure_file(lib/ZoneMinder/ONVIF.pm.in "${CMAKE_CURRENT_BINARY_DIR}/lib/ZoneMinder/ONVIF.pm" @ONLY)
 
 if(CMAKE_VERBOSE_MAKEFILE)
-	set(MAKEMAKER_NOECHO_COMMAND "")
-else(CMAKE_VERBOSE_MAKEFILE)
-	set(MAKEMAKER_NOECHO_COMMAND "NOECHO=\"1>/dev/null\"")
-endif(CMAKE_VERBOSE_MAKEFILE)
+  set(MAKEMAKER_NOECHO_COMMAND "")
+else()
+  set(MAKEMAKER_NOECHO_COMMAND "NOECHO=\"1>/dev/null\"")
+endif()
 
 # Add build target for the perl modules
 add_custom_target(zmperlmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS_FULL} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8fa36cf40..5180e5404 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,70 +5,70 @@ configure_file(zm_config_data.h.in "${CMAKE_CURRENT_BINARY_DIR}/zm_config_data.h
 
 # Group together all the source files that are used by all the binaries (zmc, zmu, zms etc)
 set(ZM_BIN_SRC_FILES
- zm_analysis_thread.cpp
- zm_box.cpp
- zm_buffer.cpp
- zm_camera.cpp
- zm_comms.cpp
- zm_config.cpp
- zm_coord.cpp
- zm_curl_camera.cpp
- zm_crypt.cpp
- zm.cpp
- zm_db.cpp
- zm_logger.cpp
- zm_event.cpp
- zm_eventstream.cpp
- zm_exception.cpp
- zm_fifo.cpp
- zm_file_camera.cpp
- zm_font.cpp
- zm_frame.cpp
- zm_group.cpp
- zm_image.cpp
- zm_jpeg.cpp
- zm_libvlc_camera.cpp
- zm_libvnc_camera.cpp
- zm_local_camera.cpp
- zm_monitor.cpp
- zm_monitorstream.cpp
- zm_ffmpeg.cpp
- zm_ffmpeg_camera.cpp
- zm_ffmpeg_input.cpp
- zm_mpeg.cpp
- zm_packet.cpp
- zm_packetqueue.cpp
- zm_poly.cpp
- zm_regexp.cpp
- zm_remote_camera.cpp
- zm_remote_camera_http.cpp
- zm_remote_camera_nvsocket.cpp
- zm_remote_camera_rtsp.cpp
- zm_rtp.cpp
- zm_rtp_ctrl.cpp
- zm_rtp_data.cpp
- zm_rtp_source.cpp
- zm_rtsp.cpp
- zm_rtsp_auth.cpp
- zm_rtsp_server_thread.cpp
- zm_rtsp_server_adts_source.cpp
- zm_rtsp_server_h264_device_source.cpp
- zm_rtsp_server_device_source.cpp
- zm_rtsp_server_server_media_subsession.cpp
- zm_rtsp_server_unicast_server_media_subsession.cpp
- zm_sdp.cpp
- zm_signal.cpp
- zm_stream.cpp
- zm_swscale.cpp
- zm_thread.cpp
- zm_time.cpp
- zm_timer.cpp
- zm_user.cpp
- zm_utils.cpp
- zm_video.cpp
- zm_videostore.cpp
- zm_zone.cpp
- zm_storage.cpp)
+  zm_analysis_thread.cpp
+  zm_box.cpp
+  zm_buffer.cpp
+  zm_camera.cpp
+  zm_comms.cpp
+  zm_config.cpp
+  zm_coord.cpp
+  zm_curl_camera.cpp
+  zm_crypt.cpp
+  zm.cpp
+  zm_db.cpp
+  zm_logger.cpp
+  zm_event.cpp
+  zm_eventstream.cpp
+  zm_exception.cpp
+  zm_fifo.cpp
+  zm_file_camera.cpp
+  zm_font.cpp
+  zm_frame.cpp
+  zm_group.cpp
+  zm_image.cpp
+  zm_jpeg.cpp
+  zm_libvlc_camera.cpp
+  zm_libvnc_camera.cpp
+  zm_local_camera.cpp
+  zm_monitor.cpp
+  zm_monitorstream.cpp
+  zm_ffmpeg.cpp
+  zm_ffmpeg_camera.cpp
+  zm_ffmpeg_input.cpp
+  zm_mpeg.cpp
+  zm_packet.cpp
+  zm_packetqueue.cpp
+  zm_poly.cpp
+  zm_regexp.cpp
+  zm_remote_camera.cpp
+  zm_remote_camera_http.cpp
+  zm_remote_camera_nvsocket.cpp
+  zm_remote_camera_rtsp.cpp
+  zm_rtp.cpp
+  zm_rtp_ctrl.cpp
+  zm_rtp_data.cpp
+  zm_rtp_source.cpp
+  zm_rtsp.cpp
+  zm_rtsp_auth.cpp
+  zm_rtsp_server_thread.cpp
+  zm_rtsp_server_adts_source.cpp
+  zm_rtsp_server_h264_device_source.cpp
+  zm_rtsp_server_device_source.cpp
+  zm_rtsp_server_server_media_subsession.cpp
+  zm_rtsp_server_unicast_server_media_subsession.cpp
+  zm_sdp.cpp
+  zm_signal.cpp
+  zm_stream.cpp
+  zm_swscale.cpp
+  zm_thread.cpp
+  zm_time.cpp
+  zm_timer.cpp
+  zm_user.cpp
+  zm_utils.cpp
+  zm_video.cpp
+  zm_videostore.cpp
+  zm_zone.cpp
+  zm_storage.cpp)
 
 # A fix for cmake recompiling the source files for every target.
 add_library(zm STATIC ${ZM_BIN_SRC_FILES})
@@ -93,13 +93,13 @@ target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS} bc
 
 # Generate man files for the binaries destined for the bin folder
 if(BUILD_MAN)
-  FOREACH(CBINARY zmc zmu)
+  foreach(CBINARY zmc zmu)
     POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp ${CBINARY} 8 ${ZM_MANPAGE_DEST_PREFIX})
-  ENDFOREACH(CBINARY zmc zmu)
-endif(BUILD_MAN)
+  endforeach(CBINARY zmc zmu)
+endif()
 
 install(TARGETS zmc zmu RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})" )
+install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nph-zms DESTINATION "${ZM_CGIDIR}")
 
diff --git a/web/CMakeLists.txt b/web/CMakeLists.txt
index 5dd8ac546..9676f1cfa 100644
--- a/web/CMakeLists.txt
+++ b/web/CMakeLists.txt
@@ -12,8 +12,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/includes/config.php" DESTINATION "${Z
 
 # Install the api config files (if its not in the source directory)
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/core.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/database.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/lib/Cake/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/lib/Cake")
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/core.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/database.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/lib/Cake/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/lib/Cake")
+endif()