Improvements to cmake: Better support for CMAKE_PREFIX_PATH enviroment variable (and similar ones), added ZM_PERL_SUBPREFIX and ZM_PERL_USE_PATH options and improved detection of libraries and headers

CMakeLists.txt

@@ -9,15 +9,15 @@
 # For more information and installation, see the INSTALL file
 #
 cmake_minimum_required (VERSION 2.6)
-project (ZoneMinder)
+project (zoneminder)
-# ZoneMinder version
+set(zoneminder_VERSION "1.26.4")
-set(ZoneMinder_VERSION "1.26.4")
+
 # 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)
 
-# Can make finding problems easier when troubleshooting.
+# Can assist in troubleshooting
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 #set(CMAKE_INSTALL_ALWAYS ON)
 
@@ -28,25 +28,24 @@ set(CMAKE_C_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
 set(CMAKE_CXX_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+
 # Modules that we need:
 include (GNUInstallDirs)
 include (CheckIncludeFile)
 include (CheckIncludeFiles)
 include (CheckFunctionExists)
-include (CheckPrototypeDefinition)
+include (CheckPrototypeDefinition_fixed)
 include (CheckTypeSize)
 include (CheckStructHasMember)
 
-# Default variables for some configuration options
+# Configuration options
-mark_as_advanced(FORCE ZM_EXTRA_LIBS ZM_MYSQL_ENGINE ZM_NO_MMAP CMAKE_INSTALL_FULL_BINDIR)
+mark_as_advanced(FORCE ZM_EXTRA_LIBS ZM_MYSQL_ENGINE ZM_NO_MMAP CMAKE_INSTALL_FULL_BINDIR ZM_PERL_SUBPREFIX ZM_PERL_USE_PATH)
 set(ZM_RUNDIR "/var/run/zm" CACHE PATH "Location of transient process files, default: /var/run/zm")
 set(ZM_TMPDIR "/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_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder/www" CACHE PATH "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
 set(ZM_CGIDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
 set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH "Location of dynamic content (events and images), default: /var/lib/zoneminder")
-# This one is not needed anymore. we do automatic detection of whats available, let ZM know and have ZM decide
-#set(ZM_SSL_LIB "openssl" CACHE STRING "Library to use for ssl functions, default: openssl")
 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")
@@ -57,17 +56,19 @@ set(ZM_WEB_GROUP "" CACHE STRING "The group apache or the local web server runs
 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_PERL_SUBPREFIX "${CMAKE_INSTALL_LIBDIR}/perl5" CACHE PATH "Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. lib will be turned into <prefix>/lib, default: ${CMAKE_INSTALL_LIBDIR}/perl5")
+set(ZM_PERL_USE_PATH "${CMAKE_INSTALL_PREFIX}/${ZM_PERL_SUBPREFIX}" CACHE PATH "Override the include path for zm perl modules. Useful if you are moving the perl modules without using the ZM_PERL_SUBPREFIX option. default: <prefix>/<zmperlprefix>")
 # Only required for cmakecacheimport:
 set(CMAKE_INSTALL_FULL_BINDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" CACHE PATH "Override default binary directory")
 
 # Required for certain checks to work
 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_CURRENT_BINARY_DIR}")
+include_directories("${CMAKE_SOURCE_DIR}")
 # This is required to enable searching in lib64 (if exists), do not change
 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
 
-# Check for misc required stuff
+# System checks
 check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
 check_include_file("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
 check_include_file("execinfo.h" HAVE_EXECINFO_H)
@@ -91,6 +92,7 @@ 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)
 endif(ZLIB_FOUND)
 
@@ -99,9 +101,13 @@ find_package(JPEG)
 if(JPEG_FOUND)
 	set(HAVE_LIBJPEG 1)
 	list(APPEND ZM_BIN_LIBS ${JPEG_LIBRARIES})
-	include_directories(${JPEG_INCLUDE_DIR})
-	check_include_files("stdio.h;jpeglib.h" HAVE_JPEGLIB_H)
 	#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 " zm requires libjpeg headers - check that libjpeg development packages are installed")
+	endif(NOT HAVE_JPEGLIB_H)
 else(JPEG_FOUND)
 	message(FATAL_ERROR "zm requires jpeg but it was not found on your system")
 endif(JPEG_FOUND)
@@ -110,102 +116,162 @@ endif(JPEG_FOUND)
 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)
 endif(OPENSSL_FOUND)
-# crypto using find_library. 
-# This library should be a part of the OpenSSL package but just need to be sure
-# In any case, we still need to define HAVE_LIBCRYPTO for zm if its available
-find_library(CRYPTO_LIBRARIES crypto)
-if(CRYPTO_LIBRARIES)
-	set(HAVE_LIBCRYPTO 1)
-	list(APPEND ZM_BIN_LIBS ${CRYPTO_LIBRARIES})
-endif(CRYPTO_LIBRARIES)
 
-# pthread using find_library
+# 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 " zm requires pthread headers - check that pthread development packages are installed")
+	endif(NOT HAVE_PTHREAD_H)
 else(PTHREAD_LIBRARIES)
 	message(FATAL_ERROR "zm requires pthread but it was not found on your system")
 endif(PTHREAD_LIBRARIES)
 
-# pcre using find_library
+# 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)
 endif(PCRE_LIBRARIES)
 
-# gcrypt using find_library
+# 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)
 endif(GCRYPT_LIBRARIES)
 
-# gnutls using find_library
+# gnutls (using find_library and find_path)
 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/openssl.h" HAVE_GNUTLS_OPENSSL_H)
 	check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
 endif(GNUTLS_LIBRARIES)
 
-# mysqlclient using find_library
+# 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/mysql.h)
+	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/mysql.h" HAVE_MYSQL_H)
+	if(NOT HAVE_MYSQL_H)
+		message(FATAL_ERROR "zm requires MySQL headers - check that MySQL development packages are installed")
+	endif(NOT HAVE_MYSQL_H)
 else(MYSQLCLIENT_LIBRARIES)
 	message(FATAL_ERROR "zm requires mysqlclient but it was not found on your system")
 endif(MYSQLCLIENT_LIBRARIES)
 
-# avformat using find_library
+# 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")
+	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)
 endif(AVFORMAT_LIBRARIES)
 
-# avcodec using find_library
+# 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")
+	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)
 endif(AVCODEC_LIBRARIES)
 
-# avdevice using find_library
+# 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")
+	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)
 endif(AVDEVICE_LIBRARIES)
 
-# avutil using find_library
+# 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")
+	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)
 endif(AVUTIL_LIBRARIES)
 
-# swscale using find_library
+# 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")
+	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)
 endif(SWSCALE_LIBRARIES)
 
@@ -216,22 +282,7 @@ if((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
 	message(FATAL_ERROR " zm requires crypto or gnutls but none were found on your system")
 endif((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
 
-# Check for absolutely required headers:
-if(NOT HAVE_MYSQL_H)
-	message(FATAL_ERROR "zm requires MySQL headers - check that MySQL development packages are installed")
-endif(NOT HAVE_MYSQL_H)
-if(NOT HAVE_JPEGLIB_H)
-	message(FATAL_ERROR " zm requires libjpeg headers - check that libjpeg development packages are installed")
-endif(NOT HAVE_JPEGLIB_H)
-if(NOT HAVE_PTHREAD_H)
-	message(FATAL_ERROR " zm requires pthread headers - check that pthread development packages are installed")
-endif(NOT HAVE_PTHREAD_H)
-
 # 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
-set(ZM_HAS_V4L 0)
-set(ZM_HAS_V4L1 0)
-set(ZM_HAS_V4L2 0)
 if(HAVE_LINUX_VIDEODEV_H)
 	set(ZM_HAS_V4L 1)
 	set(ZM_HAS_V4L1 1)
@@ -244,20 +295,31 @@ if((NOT HAVE_LINUX_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_LINUX_VIDEODEV2_H))
 # 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)
-
+# Check for mmap enable in all components
+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)
 
 # Check for authenication 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)
 if(HAVE_GNUTLS_OPENSSL_H)
+	set(CMAKE_REQUIRED_LIBRARIES ${GNUTLS_LIBRARIES})
+	set(CMAKE_REQUIRED_INCLUDES ${GNUTLS_INCLUDE_DIR})
 	check_prototype_definition(MD5 "unsigned char *MD5 (const unsigned char *buf, unsigned long len, unsigned char *md)" "NULL" "gnutls/openssl.h" HAVE_MD5_GNUTLS)
 endif(HAVE_GNUTLS_OPENSSL_H)
 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)
 if(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
@@ -272,20 +334,12 @@ if(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
 	set(HAVE_GNUTLS_OPENSSL_H 0)
 endif(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
 
-# Enable mmap in all components
+# Check for Perl
-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)
-
-# Check for Perl. Version checking is removed because its ignored before CMake 2.8.8 and it seems that Perl is being detected as 5.16. instead of 5.6.0 ??
 find_package(Perl)
 if(NOT PERL_FOUND)
 	message(FATAL_ERROR "zm requires Perl 5.6.0 or newer but it was not found on your system")
 endif(NOT PERL_FOUND)
+
 # Checking for perl modules requires FindPerlModules.cmake
 # Check all required modules at once
 # TODO: Add checking for the optional modules
@@ -316,7 +370,7 @@ message(STATUS "Using web group: ${ZM_WEB_GROUP}")
 # Some variables that zm expects
 set(ZM_PID "${ZM_RUNDIR}/zm.pid")
 set(ZM_CONFIG "/${CMAKE_INSTALL_SYSCONFDIR}/zm.conf")
-set(VERSION "${ZoneMinder_VERSION}")
+set(VERSION "${zoneminder_VERSION}")
 set(PATH_BUILD "${PROJECT_SOURCE_DIR}")
 set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder")
 set(TIME_BUILD "1000000") # Don't have a solution for this one yet
@@ -327,7 +381,7 @@ set(WEB_PREFIX "${ZM_WEBDIR}")
 set(CGI_PREFIX "${ZM_CGIDIR}")
 set(WEB_USER "${ZM_WEB_USER}")
 set(WEB_GROUP "${ZM_WEB_GROUP}")
-set(EXTRA_PERL_LIB "use lib '${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/perl5';")
+set(EXTRA_PERL_LIB "use lib '${ZM_PERL_USE_PATH}';")
 
 # Generate files from the .in files
 configure_file(zoneminder-config.cmake config.h @ONLY)

INSTALL

@@ -48,6 +48,8 @@ Advanced:
 	ZM_EXTRA_LIBS		A list of optional libraries, separated by semicolons, e.g. ssl;theora
 	ZM_MYSQL_ENGINE		MySQL engine to use with database, default: InnoDB
 	ZM_NO_MMAP		Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF
+	ZM_PERL_SUBPREFIX	Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. lib will be turned into <prefix>/lib, default: <libarch>/perl5
+	ZM_PERL_USE_PATH	Override the include path for zm perl modules. Useful if you are moving the perl modules without using the ZM_PERL_SUBPREFIX option. default: <prefix>/<zmperlprefix>
 
 
 Useful configuration options provided by cmake:

cmake/Modules/CheckPrototypeDefinition_fixed.cmake

@@ -0,0 +1,98 @@
+# - Check if the protoype we expect is correct.
+# check_prototype_definition(FUNCTION PROTOTYPE RETURN HEADER VARIABLE)
+#  FUNCTION - The name of the function (used to check if prototype exists)
+#  PROTOTYPE- The prototype to check.
+#  RETURN - The return value of the function.
+#  HEADER - The header files required.
+#  VARIABLE - The variable to store the result.
+# Example:
+#  check_prototype_definition(getpwent_r
+#   "struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)"
+#   "NULL"
+#   "unistd.h;pwd.h"
+#   SOLARIS_GETPWENT_R)
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+
+#=============================================================================
+# Copyright 2005-2009 Kitware, Inc.
+# Copyright 2010-2011 Andreas Schneider <asn@cryptomilk.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+#
+
+
+get_filename_component(__check_proto_def_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+
+function(CHECK_PROTOTYPE_DEFINITION _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIABLE)
+
+  if ("${_VARIABLE}" MATCHES "^${_VARIABLE}$")
+    set(CHECK_PROTOTYPE_DEFINITION_CONTENT "/* */\n")
+
+    set(CHECK_PROTOTYPE_DEFINITION_FLAGS ${CMAKE_REQUIRED_FLAGS})
+    if (CMAKE_REQUIRED_LIBRARIES)
+      set(CHECK_PROTOTYPE_DEFINITION_LIBS
+        ${LINK_LIBRARIES} ${CMAKE_REQUIRED_LIBRARIES})
+    else()
+      set(CHECK_PROTOTYPE_DEFINITION_LIBS)
+    endif()
+    if (CMAKE_REQUIRED_INCLUDES)
+      set(CMAKE_SYMBOL_EXISTS_INCLUDES
+        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+    else()
+      set(CMAKE_SYMBOL_EXISTS_INCLUDES)
+    endif()
+
+    foreach(_FILE ${_HEADER})
+      set(CHECK_PROTOTYPE_DEFINITION_HEADER
+        "${CHECK_PROTOTYPE_DEFINITION_HEADER}#include <${_FILE}>\n")
+    endforeach()
+
+    set(CHECK_PROTOTYPE_DEFINITION_SYMBOL ${_FUNCTION})
+    set(CHECK_PROTOTYPE_DEFINITION_PROTO ${_PROTOTYPE})
+    set(CHECK_PROTOTYPE_DEFINITION_RETURN ${_RETURN})
+
+    configure_file("${__check_proto_def_dir}/CheckPrototypeDefinition.c.in"
+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c" @ONLY)
+
+    file(READ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c _SOURCE)
+
+    try_compile(${_VARIABLE}
+      ${CMAKE_BINARY_DIR}
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+      ${CHECK_PROTOTYPE_DEFINITION_LIBS}
+      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CHECK_PROTOTYPE_DEFINITION_FLAGS}
+      "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
+      OUTPUT_VARIABLE OUTPUT)
+
+    if (${_VARIABLE})
+      set(${_VARIABLE} 1 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
+      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - True")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} passed with the following output:\n"
+        "${OUTPUT}\n\n")
+    else ()
+      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - False")
+      set(${_VARIABLE} 0 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} failed with the following output:\n"
+        "${OUTPUT}\n\n${_SOURCE}\n\n")
+    endif ()
+  endif()
+
+endfunction()

scripts/ZoneMinder/CMakeLists.txt

@@ -7,7 +7,7 @@ configure_file(lib/ZoneMinder/Memory.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneM
 configure_file(lib/ZoneMinder/ConfigData.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneMinder/ConfigData.pm @ONLY)
 
 # Add build target for the perl modules
-add_custom_target(zmperlmodules ALL perl Makefile.PL FIRST_MAKEFILE=MakefilePerl PREFIX=output LIB="output/${CMAKE_INSTALL_LIBDIR}/perl5" COMMAND make --makefile=MakefilePerl COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
+add_custom_target(zmperlmodules ALL perl Makefile.PL FIRST_MAKEFILE=MakefilePerl PREFIX=output LIB="output/${ZM_PERL_SUBPREFIX}" COMMAND make --makefile=MakefilePerl COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
 
 # Add install target for the perl modules
 install(DIRECTORY output/ DESTINATION "${CMAKE_INSTALL_PREFIX}")