Przeglądaj źródła

UI: Allow cmake vars for deps and add DepsPath var

Allow cmake variables to be used to specify include directories, and
allow DepsPath or DepsPath32/64 to be used to specify dependency
locations.
jp9000 10 lat temu
rodzic
commit
6f2587d21a

+ 6 - 0
cmake/Modules/FindFFMpeg.cmake

@@ -42,6 +42,12 @@ function(find_ffmpeg_library component header)
 		HINTS
 			ENV FFmpegPath${_lib_suffix}
 			ENV FFmpegPath
+			ENV DepsPath${_lib_suffix}
+			ENV DepsPath
+			${FFmpegPath${lib_suffix}}
+			${FFmpegPath}
+			${DepsPath${lib_suffix}}
+			${DepsPath}
 			${PC_FFMPEG_${component}_INCLUDE_DIRS}
 		PATH_SUFFIXES ffmpeg libav)
 

+ 6 - 0
cmake/Modules/FindFreetype.cmake

@@ -22,6 +22,12 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build
 		ENV FreetypePath${_lib_suffix}
 		ENV FreetypePath
 		ENV FREETYPE_DIR
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${FreetypePath${lib_suffix}}
+		${FreetypePath}
+		${DepsPath${lib_suffix}}
+		${DepsPath}
 		${_FREETYPE_INCLUDE_DIRS}
 	PATHS
 		/usr/include /usr/local/include /opt/local/include /sw/include

+ 6 - 0
cmake/Modules/FindJansson.cmake

@@ -21,6 +21,12 @@ find_path(Jansson_INCLUDE_DIR
 	HINTS
 		ENV JanssonPath${_lib_suffix}
 		ENV JanssonPath
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${JanssonPath${lib_suffix}}
+		${JanssonPath}
+		${DepsPath${lib_suffix}}
+		${DepsPath}
 		${_JANSSON_INCLUDE_DIRS}
 	PATHS
 		/usr/include /usr/local/include /opt/local/include /sw/include)

+ 6 - 0
cmake/Modules/FindLibcurl.cmake

@@ -24,6 +24,12 @@ find_path(CURL_INCLUDE_DIR
 	HINTS
 		ENV curlPath${_lib_suffix}
 		ENV curlPath
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${curlPath${lib_suffix}}
+		${curlPath}
+		${DepsPath${lib_suffix}}
+		${DepsPath}
 		${_CURL_INCLUDE_DIRS}
 	PATHS
 		/usr/include /usr/local/include /opt/local/include /sw/include

+ 6 - 0
cmake/Modules/FindLibx264.cmake

@@ -24,6 +24,12 @@ find_path(X264_INCLUDE_DIR
 	HINTS
 		ENV x264Path${_lib_suffix}
 		ENV x264Path
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${x264Path${lib_suffix}}
+		${x264Path}
+		${DepsPath${lib_suffix}}
+		${DepsPath}
 		${_X264_INCLUDE_DIRS}
 	PATHS
 		/usr/include /usr/local/include /opt/local/include /sw/include)