diff --git a/CMakeLists.txt b/CMakeLists.txt index 35f7c194..4c2861c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,14 +2,6 @@ cmake_minimum_required(VERSION 3.1.3) #使能c++11 set(CMAKE_CXX_STANDARD 11) -SET(CMAKE_C_COMPILER aarch64-himix100-linux-gcc) -SET(CMAKE_CXX_COMPILER aarch64-himix100-linux-g++) -#SET(CMAKE_LINKER aarch64-himix100-linux-ld) -SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - - #加载自定义模块 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") @@ -22,7 +14,6 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(ToolKit_Root ${CMAKE_SOURCE_DIR}/3rdpart/ZLToolKit/src) set(MediaKit_Root ${CMAKE_SOURCE_DIR}/src) - #设置头文件目录 INCLUDE_DIRECTORIES(${ToolKit_Root}) INCLUDE_DIRECTORIES(${MediaKit_Root}) @@ -41,15 +32,12 @@ endif () set(ENABLE_HLS true) set(ENABLE_OPENSSL true) -set(ENABLE_MYSQL false) +set(ENABLE_MYSQL true) set(ENABLE_MP4V2 true) -set(ENABLE_FAAC false) -set(ENABLE_X264 false) +set(ENABLE_FAAC true) +set(ENABLE_X264 true) set(ENABLE_MP4RECORD true) - - - #添加两个静态库 if(ENABLE_HLS) message(STATUS "ENABLE_HLS defined") @@ -66,22 +54,13 @@ if(ENABLE_MP4RECORD) set(MediaServer_Root ${CMAKE_SOURCE_DIR}/3rdpart/media-server) list(APPEND LINK_LIB_LIST mov flv) endif() - -set(OPENSSL_INCLUDE_DIR /nand/hi3559/openssl/include/) -set(OPENSSL_LIBRARIES /nand/hi3559/openssl/lib/) -#set(OPENSSL_CRYPTO_LIBRARIES /nand/hi3559/openssl/lib/libcrypto.so) - -set(MP4V2_INCLUDE_DIR /nand/hi3559/mp4v2/include/) -#set(MP4V2_LIBRARY /nand/hi3559/mp4v2/lib/libmp4v2.a) -set(MP4V2_LIBRARY /nand/hi3559/mp4v2/lib/libmp4v2.so) - #查找openssl是否安装 find_package(OpenSSL QUIET) -if (1) +if (OPENSSL_FOUND AND ENABLE_OPENSSL) message(STATUS "found library:${OPENSSL_LIBRARIES},ENABLE_OPENSSL defined") - include_directories(/nand/hi3559/openssl/include/) + include_directories(${OPENSSL_INCLUDE_DIR}) add_definitions(-DENABLE_OPENSSL) - list(APPEND LINK_LIB_LIST /nand/hi3559/openssl/lib/libssl.so /nand/hi3559/openssl/lib/libcrypto.so) + list(APPEND LINK_LIB_LIST ${OPENSSL_LIBRARIES}) endif () #查找mysql是否安装 @@ -132,7 +111,7 @@ set(VS_FALGS "/wd4819 /wd4996 /wd4018 /wd4267 /wd4244 /wd4101 /wd4828 /wd4309 /w if(ENABLE_HLS) aux_source_directory(${MediaServer_Root}/libmpeg/include src_mpeg) aux_source_directory(${MediaServer_Root}/libmpeg/source src_mpeg) - include_directories(${MediaServer_Root}/libmpeg/include) + include_directories(${MediaServer_Root}/libmpeg/include) add_library(mpeg STATIC ${src_mpeg}) if(WIN32) set_target_properties(mpeg PROPERTIES COMPILE_FLAGS ${VS_FALGS} )