mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 13:50:38 -04:00
bfde1e8cb6
- submitter becomes maintainer - A huge list of changes since April 2013 can be found here: https://github.com/ZoneMinder/ZoneMinder/releases/ PR: 210007 Submitted by: bsd@abinet.ru
32 lines
1.3 KiB
Text
32 lines
1.3 KiB
Text
--- CMakeLists.txt.orig 2016-06-01 00:41:17 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -385,13 +385,13 @@ find_library(MYSQLCLIENT_LIBRARIES mysql
|
|
if(MYSQLCLIENT_LIBRARIES)
|
|
set(HAVE_LIBMYSQLCLIENT 1)
|
|
list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
|
|
- find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h)
|
|
+ find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h /usr/local/include/mysql /usr/include/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/mysql.h" HAVE_MYSQL_H)
|
|
+ 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")
|
|
@@ -658,13 +658,6 @@ endif(NOT ZM_WEB_GROUP)
|
|
message(STATUS "Using web user: ${ZM_WEB_USER}")
|
|
message(STATUS "Using web group: ${ZM_WEB_GROUP}")
|
|
|
|
-# Check for polkit
|
|
-find_package(Polkit)
|
|
-if(NOT POLKIT_FOUND)
|
|
- message(FATAL_ERROR
|
|
- "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
|
|
-endif(NOT POLKIT_FOUND)
|
|
-
|
|
# Some variables that zm expects
|
|
set(ZM_PID "${ZM_RUNDIR}/zm.pid")
|
|
set(ZM_CONFIG "${ZM_CONFIG_DIR}/zm.conf")
|