Forráskód Böngészése

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.
jp9000 11 éve
szülő
commit
5fb149a48c

+ 4 - 0
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

+ 4 - 0
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)
 

+ 4 - 0
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)
 

+ 4 - 0
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)
 

+ 4 - 0
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)
 

+ 4 - 0
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)
 

+ 4 - 0
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)
 

+ 4 - 0
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)