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

Improve/fix cmake find modules

Browse Source
This commit is contained in:
BtbN 2014-07-29 01:46:30 +02:00
parent 28ded1f6b6
commit 60ef547285
8 changed files with 26 additions and 20 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
NAMES jansson.h
HINTS
${_JANSSON_INCLUDE_DIRS}
ENV JanssonPath
ENV ${JANSSON_PATH_ARCH}
${_JANSSON_INCLUDE_DIRS}
PATHS
/usr/include /usr/local/include /opt/local/include /sw/include)
find_library(Jansson_LIB
NAMES jansson libjansson
NAMES ${_JANSSON_LIBRARIES} jansson libjansson
HINTS
${Jansson_INCLUDE_DIR}/../lib
${Jansson_INCLUDE_DIR}/lib${_lib_suffix}
${_JANSSON_LIBRARY_DIRS}
"${Jansson_INCLUDE_DIR}/../lib"
"${Jansson_INCLUDE_DIR}/lib${_lib_suffix}"
PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib)
if(JANSSON_VERSION)

4
cmake/Modules/FindLibavcodec.cmake
View File

@ -28,7 +28,7 @@ else()
find_path(FFMPEG_INCLUDE_DIR
NAMES libavcodec/avcodec.h
HINTS
"${_AVCODEC_INCLUDE_DIRS}"
${_AVCODEC_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
@ -40,7 +40,7 @@ else()
find_library(AVCODEC_LIB
NAMES ${_AVCODEC_LIBRARIES} avcodec-ffmpeg avcodec
HINTS
"${_AVCODEC_LIBRARY_DIRS}"
${_AVCODEC_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"

4
cmake/Modules/FindLibavformat.cmake
View File

@ -24,7 +24,7 @@ else()
find_path(FFMPEG_INCLUDE_DIR
NAMES libavformat/avformat.h
HINTS
"${_AVFORMAT_INCLUDE_DIRS}"
${_AVFORMAT_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
@ -36,7 +36,7 @@ else()
find_library(AVFORMAT_LIB
NAMES ${_AVFORMAT_LIBRARIES} avformat-ffmpeg avformat
HINTS
"${_AVFORMAT_LIBRARY_DIRS}"
${_AVFORMAT_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"

4
cmake/Modules/FindLibavutil.cmake
View File

@ -24,7 +24,7 @@ else()
find_path(FFMPEG_INCLUDE_DIR
NAMES libavutil/avutil.h
HINTS
"${_AVUTIL_INCLUDE_DIRS}"
${_AVUTIL_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
@ -36,7 +36,7 @@ else()
find_library(AVUTIL_LIB
NAMES ${_AVUTIL_LIBRARIES} avutil-ffmpeg avutil
HINTS
"${_AVUTIL_LIBRARY_DIRS}"
${_AVUTIL_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"

8
cmake/Modules/FindLibfdk.cmake
View File

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

4
cmake/Modules/FindLibswresample.cmake
View File

@ -24,7 +24,7 @@ else()
find_path(FFMPEG_INCLUDE_DIR
NAMES libswresample/swresample.h
HINTS
"${_SWRESAMPLE_INCLUDE_DIRS}"
${_SWRESAMPLE_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
@ -36,7 +36,7 @@ else()
find_library(SWRESAMPLE_LIB
NAMES ${_SWRESAMPLE_LIBRARIES} swresample-ffmpeg swresample
HINTS
"${_SWRESAMPLE_LIBRARY_DIRS}"
${_SWRESAMPLE_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"

4
cmake/Modules/FindLibswscale.cmake
View File

@ -24,7 +24,7 @@ else()
find_path(FFMPEG_INCLUDE_DIR
NAMES libswscale/swscale.h
HINTS
"${_SWSCALE_INCLUDE_DIRS}"
${_SWSCALE_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
@ -36,7 +36,7 @@ else()
find_library(SWSCALE_LIB
NAMES ${_SWSCALE_LIBRARIES} swscale-ffmpeg swscale
HINTS
"${_SWSCALE_LIBRARY_DIRS}"
${_SWSCALE_LIBRARY_DIRS}
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"

8
cmake/Modules/FindLibx264.cmake
View File

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