jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #217 from BtbN/cmake_changes

Browse Source 
CMake changes for new real ffmpeg in debian experimental
This commit is contained in:
Jim 2014-07-29 11:40:49 -07:00
commit 254b50f31f
8 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/Modules/FindJansson.cmake
View File

@ -25,17 +25,19 @@ else()
find_path(Jansson_INCLUDE_DIR find_path(Jansson_INCLUDE_DIR
NAMES jansson.h NAMES jansson.h
HINTS HINTS
${_JANSSON_INCLUDE_DIRS}
ENV JanssonPath ENV JanssonPath
ENV ${JANSSON_PATH_ARCH} ENV ${JANSSON_PATH_ARCH}
${_JANSSON_INCLUDE_DIRS} PATHS
/usr/include /usr/local/include /opt/local/include /sw/include) /usr/include /usr/local/include /opt/local/include /sw/include)
find_library(Jansson_LIB find_library(Jansson_LIB
NAMES jansson libjansson NAMES ${_JANSSON_LIBRARIES} jansson libjansson
HINTS HINTS
${Jansson_INCLUDE_DIR}/../lib
${Jansson_INCLUDE_DIR}/lib${_lib_suffix}
${_JANSSON_LIBRARY_DIRS} ${_JANSSON_LIBRARY_DIRS}
"${Jansson_INCLUDE_DIR}/../lib"
"${Jansson_INCLUDE_DIR}/lib${_lib_suffix}"
PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib) /usr/lib /usr/local/lib /opt/local/lib /sw/lib)
if(JANSSON_VERSION) if(JANSSON_VERSION)

8
cmake/Modules/FindLibavcodec.cmake
View File

@ -28,23 +28,25 @@ else()
find_path(FFMPEG_INCLUDE_DIR find_path(FFMPEG_INCLUDE_DIR
NAMES libavcodec/avcodec.h NAMES libavcodec/avcodec.h
HINTS HINTS
${_AVCODEC_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include" "${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include" "$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH} ENV ${FFMPEG_PATH_ARCH}
"${_AVCODEC_INCLUDE_DIRS}" PATHS
/usr/include /usr/local/include /opt/local/include /sw/include /usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav) PATH_SUFFIXES ffmpeg libav)
find_library(AVCODEC_LIB find_library(AVCODEC_LIB
NAMES avcodec NAMES ${_AVCODEC_LIBRARIES} avcodec-ffmpeg avcodec
HINTS HINTS
${_AVCODEC_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_AVCODEC_LIBRARY_DIRS}" PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib) /usr/lib /usr/local/lib /opt/local/lib /sw/lib)
set(LIBAVCODEC_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavcodec include dir") set(LIBAVCODEC_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavcodec include dir")

8
cmake/Modules/FindLibavformat.cmake
View File

@ -24,23 +24,25 @@ else()
find_path(FFMPEG_INCLUDE_DIR find_path(FFMPEG_INCLUDE_DIR
NAMES libavformat/avformat.h NAMES libavformat/avformat.h
HINTS HINTS
${_AVFORMAT_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include" "${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include" "$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH} ENV ${FFMPEG_PATH_ARCH}
"${_AVFORMAT_INCLUDE_DIRS}" PATHS
/usr/include /usr/local/include /opt/local/include /sw/include /usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav) PATH_SUFFIXES ffmpeg libav)
find_library(AVFORMAT_LIB find_library(AVFORMAT_LIB
NAMES avformat NAMES ${_AVFORMAT_LIBRARIES} avformat-ffmpeg avformat
HINTS HINTS
${_AVFORMAT_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_AVFORMAT_LIBRARY_DIRS}" PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib) /usr/lib /usr/local/lib /opt/local/lib /sw/lib)
set(LIBAVFORMAT_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavformat include dir") set(LIBAVFORMAT_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavformat include dir")

8
cmake/Modules/FindLibavutil.cmake
View File

@ -24,23 +24,25 @@ else()
find_path(FFMPEG_INCLUDE_DIR find_path(FFMPEG_INCLUDE_DIR
NAMES libavutil/avutil.h NAMES libavutil/avutil.h
HINTS HINTS
${_AVUTIL_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include" "${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include" "$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH} ENV ${FFMPEG_PATH_ARCH}
"${_AVUTIL_INCLUDE_DIRS}" PATHS
/usr/include /usr/local/include /opt/local/include /sw/include /usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav) PATH_SUFFIXES ffmpeg libav)
find_library(AVUTIL_LIB find_library(AVUTIL_LIB
NAMES avutil NAMES ${_AVUTIL_LIBRARIES} avutil-ffmpeg avutil
HINTS HINTS
${_AVUTIL_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_AVUTIL_LIBRARY_DIRS}" PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib) /usr/lib /usr/local/lib /opt/local/lib /sw/lib)
set(LIBAVUTIL_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavutil include dir") set(LIBAVUTIL_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavutil include dir")

8
cmake/Modules/FindLibfdk.cmake
View File

@ -29,24 +29,26 @@ else()
find_path(Libfdk_INCLUDE_DIR find_path(Libfdk_INCLUDE_DIR
NAMES fdk-aac/aacenc_lib.h NAMES fdk-aac/aacenc_lib.h
HINTS HINTS
${_LIBFDK_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include" "${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include" "$ENV{obsAdditionalInstallFiles}/include"
ENV LibfdkPath ENV LibfdkPath
ENV FFmpegPath ENV FFmpegPath
ENV ${LIBFDK_PATH_ARCH} ENV ${LIBFDK_PATH_ARCH}
ENV ${FFMPEG_PATH_ARCH} ENV ${FFMPEG_PATH_ARCH}
"${_LIBFDK_INCLUDE_DIRS}" PATHS
/usr/include /usr/local/include /opt/local/include /sw/include) /usr/include /usr/local/include /opt/local/include /sw/include)
find_library(Libfdk_LIB find_library(Libfdk_LIB
NAMES fdk-aac libfdk-aac NAMES ${_LIBFDK_LIBRARIES} fdk-aac libfdk-aac
HINTS HINTS
${_LIBFDK_LIBRARY_DIRS}
"${Libfdk_INCLUDE_DIR}/../lib" "${Libfdk_INCLUDE_DIR}/../lib"
"${Libfdk_INCLUDE_DIR}/../lib${_lib_suffix}" "${Libfdk_INCLUDE_DIR}/../lib${_lib_suffix}"
"${Libfdk_INCLUDE_DIR}/../libs${_lib_suffix}" "${Libfdk_INCLUDE_DIR}/../libs${_lib_suffix}"
"${Libfdk_INCLUDE_DIR}/lib" "${Libfdk_INCLUDE_DIR}/lib"
"${Libfdk_INCLUDE_DIR}/lib${_lib_suffix}" "${Libfdk_INCLUDE_DIR}/lib${_lib_suffix}"
"${_LIBFDK_LIBRARY_DIRS}" PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib) /usr/lib /usr/local/lib /opt/local/lib /sw/lib)
set(LIBFDK_INCLUDE_DIRS ${Libfdk_INCLUDE_DIR} CACHE PATH "Libfdk include dir") set(LIBFDK_INCLUDE_DIRS ${Libfdk_INCLUDE_DIR} CACHE PATH "Libfdk include dir")

8
cmake/Modules/FindLibswresample.cmake
View File

@ -24,23 +24,25 @@ else()
find_path(FFMPEG_INCLUDE_DIR find_path(FFMPEG_INCLUDE_DIR
NAMES libswresample/swresample.h NAMES libswresample/swresample.h
HINTS HINTS
${_SWRESAMPLE_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include" "${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include" "$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH} ENV ${FFMPEG_PATH_ARCH}
"${_SWRESAMPLE_INCLUDE_DIRS}" PATHS
/usr/include /usr/local/include /opt/local/include /sw/include /usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav) PATH_SUFFIXES ffmpeg libav)
find_library(SWRESAMPLE_LIB find_library(SWRESAMPLE_LIB
NAMES swresample NAMES ${_SWRESAMPLE_LIBRARIES} swresample-ffmpeg swresample
HINTS HINTS
${_SWRESAMPLE_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_SWRESAMPLE_LIBRARY_DIRS}" PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib) /usr/lib /usr/local/lib /opt/local/lib /sw/lib)
set(LIBSWRESAMPLE_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libswresample include dir") set(LIBSWRESAMPLE_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libswresample include dir")

8
cmake/Modules/FindLibswscale.cmake
View File

@ -24,23 +24,25 @@ else()
find_path(FFMPEG_INCLUDE_DIR find_path(FFMPEG_INCLUDE_DIR
NAMES libswscale/swscale.h NAMES libswscale/swscale.h
HINTS HINTS
${_SWSCALE_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include" "${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include" "$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH} ENV ${FFMPEG_PATH_ARCH}
"${_SWSCALE_INCLUDE_DIRS}" PATHS
/usr/include /usr/local/include /opt/local/include /sw/include /usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav) PATH_SUFFIXES ffmpeg libav)
find_library(SWSCALE_LIB find_library(SWSCALE_LIB
NAMES swscale NAMES ${_SWSCALE_LIBRARIES} swscale-ffmpeg swscale
HINTS HINTS
${_SWSCALE_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_SWSCALE_LIBRARY_DIRS}" PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib) /usr/lib /usr/local/lib /opt/local/lib /sw/lib)
set(LIBSWSCALE_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libswscale include dir") set(LIBSWSCALE_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libswscale include dir")

8
cmake/Modules/FindLibx264.cmake
View File

@ -29,24 +29,26 @@ else()
find_path(X264_INCLUDE_DIR find_path(X264_INCLUDE_DIR
NAMES x264.h NAMES x264.h
HINTS HINTS
${_X264_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include" "${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include" "$ENV{obsAdditionalInstallFiles}/include"
ENV x264Path ENV x264Path
ENV FFmpegPath ENV FFmpegPath
ENV ${X264_PATH_ARCH} ENV ${X264_PATH_ARCH}
ENV ${FFMPEG_PATH_ARCH} ENV ${FFMPEG_PATH_ARCH}
"${_X264_INCLUDE_DIRS}" PATHS
/usr/include /usr/local/include /opt/local/include /sw/include) /usr/include /usr/local/include /opt/local/include /sw/include)
find_library(X264_LIB find_library(X264_LIB
NAMES x264 libx264 NAMES ${_X264_LIBRARIES} x264 libx264
HINTS HINTS
${_X264_LIBRARY_DIRS}
"${X264_INCLUDE_DIR}/../lib" "${X264_INCLUDE_DIR}/../lib"
"${X264_INCLUDE_DIR}/../lib${_lib_suffix}" "${X264_INCLUDE_DIR}/../lib${_lib_suffix}"
"${X264_INCLUDE_DIR}/../libs${_lib_suffix}" "${X264_INCLUDE_DIR}/../libs${_lib_suffix}"
"${X264_INCLUDE_DIR}/lib" "${X264_INCLUDE_DIR}/lib"
"${X264_INCLUDE_DIR}/lib${_lib_suffix}" "${X264_INCLUDE_DIR}/lib${_lib_suffix}"
"${_X264_LIBRARY_DIRS}" PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib) /usr/lib /usr/local/lib /opt/local/lib /sw/lib)
set(LIBX264_INCLUDE_DIRS ${X264_INCLUDE_DIR} CACHE PATH "x264 include dir") set(LIBX264_INCLUDE_DIRS ${X264_INCLUDE_DIR} CACHE PATH "x264 include dir")