From f9e003de22d4a6cd1906b6dfb0594d80c9144870 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 28 Jan 2021 09:07:54 -0500 Subject: [PATCH] Remove mp4v2 and libx264 from cmake --- CMakeLists.txt | 53 -------------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04b20247b..06a5fb096 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -479,59 +479,6 @@ else(MYSQLCLIENT_LIBRARIES) "ZoneMinder requires mysqlclient but it was not found on your system") endif(MYSQLCLIENT_LIBRARIES) -# x264 (using find_library and find_path) -find_library(X264_LIBRARIES x264) -if(X264_LIBRARIES) - set(HAVE_LIBX264 1) - list(APPEND ZM_BIN_LIBS "${X264_LIBRARIES}") - find_path(X264_INCLUDE_DIR x264.h) - if(X264_INCLUDE_DIR) - include_directories("${X264_INCLUDE_DIR}") - set(CMAKE_REQUIRED_INCLUDES "${X264_INCLUDE_DIR}") - endif(X264_INCLUDE_DIR) - mark_as_advanced(FORCE X264_LIBRARIES X264_INCLUDE_DIR) - check_include_files("stdint.h;x264.h" HAVE_X264_H) - set(optlibsfound "${optlibsfound} x264") -else(X264_LIBRARIES) - set(optlibsnotfound "${optlibsnotfound} x264") -endif(X264_LIBRARIES) - -# mp4v2 (using find_library and find_path) -find_library(MP4V2_LIBRARIES mp4v2) -if(MP4V2_LIBRARIES) - set(HAVE_LIBMP4V2 1) - list(APPEND ZM_BIN_LIBS "${MP4V2_LIBRARIES}") - - # mp4v2/mp4v2.h - find_path(MP4V2_INCLUDE_DIR mp4v2/mp4v2.h) - if(MP4V2_INCLUDE_DIR) - include_directories("${MP4V2_INCLUDE_DIR}") - set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}") - check_include_file("mp4v2/mp4v2.h" HAVE_MP4V2_MP4V2_H) - endif(MP4V2_INCLUDE_DIR) - - # mp4v2.h - find_path(MP4V2_INCLUDE_DIR mp4v2.h) - if(MP4V2_INCLUDE_DIR) - include_directories("${MP4V2_INCLUDE_DIR}") - set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}") - check_include_file("mp4v2.h" HAVE_MP4V2_H) - endif(MP4V2_INCLUDE_DIR) - - # mp4.h - find_path(MP4V2_INCLUDE_DIR mp4.h) - if(MP4V2_INCLUDE_DIR) - include_directories("${MP4V2_INCLUDE_DIR}") - set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}") - check_include_file("mp4.h" HAVE_MP4_H) - endif(MP4V2_INCLUDE_DIR) - - mark_as_advanced(FORCE MP4V2_LIBRARIES MP4V2_INCLUDE_DIR) - set(optlibsfound "${optlibsfound} mp4v2") -else(MP4V2_LIBRARIES) - set(optlibsnotfound "${optlibsnotfound} mp4v2") -endif(MP4V2_LIBRARIES) - set(PATH_FFMPEG "") set(OPT_FFMPEG "no") # avformat (using find_library and find_path)