From 5fb149a48c826b745ccd2ae7f9dc48942450b705 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 22 Sep 2014 17:19:44 -0700 Subject: [PATCH] Add more search directories for cmake modules I actually did this because it makes it a bit easier to use with a build from cross-compiled windows FFMpeg/x264 DLLs. When compiling on linux I just have it compile to a custom prefix directory for the specific windows arch, then I just copy the arch dir back to my windows HD when complete. Adding this to the cmake allows me to use the compile arch directories directly without modification. --- cmake/Modules/FindFreetype.cmake | 4 ++++ cmake/Modules/FindLibavcodec.cmake | 4 ++++ cmake/Modules/FindLibavformat.cmake | 4 ++++ cmake/Modules/FindLibavutil.cmake | 4 ++++ cmake/Modules/FindLibfdk.cmake | 4 ++++ cmake/Modules/FindLibswresample.cmake | 4 ++++ cmake/Modules/FindLibswscale.cmake | 4 ++++ cmake/Modules/FindLibx264.cmake | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/cmake/Modules/FindFreetype.cmake b/cmake/Modules/FindFreetype.cmake index c7e611612..421fb2b3d 100644 --- a/cmake/Modules/FindFreetype.cmake +++ b/cmake/Modules/FindFreetype.cmake @@ -58,6 +58,10 @@ find_library(FREETYPE_LIB "${FREETYPE_INCLUDE_DIR_ft2build}/../lib" "${FREETYPE_INCLUDE_DIR_ft2build}/lib${_lib_suffix}" "${FREETYPE_INCLUDE_DIR_ft2build}/lib" + "${FREETYPE_INCLUDE_DIR_ft2build}/bin" + "${FREETYPE_INCLUDE_DIR_ft2build}/bin${_lib_suffix}" + "${FREETYPE_INCLUDE_DIR_ft2build}/../bin" + "${FREETYPE_INCLUDE_DIR_ft2build}/../bin${_lib_suffix}" ENV FREETYPE_DIR PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib diff --git a/cmake/Modules/FindLibavcodec.cmake b/cmake/Modules/FindLibavcodec.cmake index 49ac68d98..020d34a3b 100644 --- a/cmake/Modules/FindLibavcodec.cmake +++ b/cmake/Modules/FindLibavcodec.cmake @@ -42,6 +42,10 @@ find_library(AVCODEC_LIB "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/bin" + "${FFMPEG_INCLUDE_DIR}/bin${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/../bin" + "${FFMPEG_INCLUDE_DIR}/../bin${_lib_suffix}" PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibavformat.cmake b/cmake/Modules/FindLibavformat.cmake index 1f7d9c8db..3fe0779fd 100644 --- a/cmake/Modules/FindLibavformat.cmake +++ b/cmake/Modules/FindLibavformat.cmake @@ -38,6 +38,10 @@ find_library(AVFORMAT_LIB "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/bin" + "${FFMPEG_INCLUDE_DIR}/bin${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/../bin" + "${FFMPEG_INCLUDE_DIR}/../bin${_lib_suffix}" PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibavutil.cmake b/cmake/Modules/FindLibavutil.cmake index 1ece8ae4e..99cd2d6cd 100644 --- a/cmake/Modules/FindLibavutil.cmake +++ b/cmake/Modules/FindLibavutil.cmake @@ -38,6 +38,10 @@ find_library(AVUTIL_LIB "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/bin" + "${FFMPEG_INCLUDE_DIR}/bin${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/../bin" + "${FFMPEG_INCLUDE_DIR}/../bin${_lib_suffix}" PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibfdk.cmake b/cmake/Modules/FindLibfdk.cmake index f8b913204..b68f3c965 100644 --- a/cmake/Modules/FindLibfdk.cmake +++ b/cmake/Modules/FindLibfdk.cmake @@ -44,6 +44,10 @@ find_library(Libfdk_LIB "${Libfdk_INCLUDE_DIR}/../libs${_lib_suffix}" "${Libfdk_INCLUDE_DIR}/lib" "${Libfdk_INCLUDE_DIR}/lib${_lib_suffix}" + "${Libfdk_INCLUDE_DIR}/bin" + "${Libfdk_INCLUDE_DIR}/bin${_lib_suffix}" + "${Libfdk_INCLUDE_DIR}/../bin" + "${Libfdk_INCLUDE_DIR}/../bin${_lib_suffix}" PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibswresample.cmake b/cmake/Modules/FindLibswresample.cmake index 72008bbd8..d8803dbf8 100644 --- a/cmake/Modules/FindLibswresample.cmake +++ b/cmake/Modules/FindLibswresample.cmake @@ -38,6 +38,10 @@ find_library(SWRESAMPLE_LIB "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/bin" + "${FFMPEG_INCLUDE_DIR}/bin${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/../bin" + "${FFMPEG_INCLUDE_DIR}/../bin${_lib_suffix}" PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibswscale.cmake b/cmake/Modules/FindLibswscale.cmake index 1ace7106b..d02f138d7 100644 --- a/cmake/Modules/FindLibswscale.cmake +++ b/cmake/Modules/FindLibswscale.cmake @@ -38,6 +38,10 @@ find_library(SWSCALE_LIB "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/bin" + "${FFMPEG_INCLUDE_DIR}/bin${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/../bin" + "${FFMPEG_INCLUDE_DIR}/../bin${_lib_suffix}" PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibx264.cmake b/cmake/Modules/FindLibx264.cmake index c6e214f6b..63769dca0 100644 --- a/cmake/Modules/FindLibx264.cmake +++ b/cmake/Modules/FindLibx264.cmake @@ -44,6 +44,10 @@ find_library(X264_LIB "${X264_INCLUDE_DIR}/../libs${_lib_suffix}" "${X264_INCLUDE_DIR}/lib" "${X264_INCLUDE_DIR}/lib${_lib_suffix}" + "${X264_INCLUDE_DIR}/bin" + "${X264_INCLUDE_DIR}/bin${_lib_suffix}" + "${X264_INCLUDE_DIR}/../bin" + "${X264_INCLUDE_DIR}/../bin${_lib_suffix}" PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib)