From f2d2b58ae294236cdbef021e51de400cfd06f1d4 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 18 Jul 2014 20:05:42 -0700 Subject: [PATCH] Add support for 32/64bit environment variables This can make it a bit easier to set up 32bit/64bit environments separately on windows. This simply allows you to additionally set FFmpegPath32, FFmpegPath64, x264Path32, x264Path64, etc. --- cmake/Modules/FindJansson.cmake | 3 +++ cmake/Modules/FindLibavcodec.cmake | 4 ++++ cmake/Modules/FindLibavformat.cmake | 4 ++++ cmake/Modules/FindLibavutil.cmake | 4 ++++ cmake/Modules/FindLibfdk.cmake | 6 ++++++ cmake/Modules/FindLibswresample.cmake | 4 ++++ cmake/Modules/FindLibswscale.cmake | 4 ++++ cmake/Modules/FindLibx264.cmake | 6 ++++++ 8 files changed, 35 insertions(+) diff --git a/cmake/Modules/FindJansson.cmake b/cmake/Modules/FindJansson.cmake index 6518bb2dc..ed9a83678 100644 --- a/cmake/Modules/FindJansson.cmake +++ b/cmake/Modules/FindJansson.cmake @@ -20,10 +20,13 @@ else() set(_lib_suffix 32) endif() + set(JANSSON_PATH_ARCH JanssonPath${_lib_suffix}) + find_path(Jansson_INCLUDE_DIR NAMES jansson.h HINTS ENV JanssonPath + ENV ${JANSSON_PATH_ARCH} ${_JANSSON_INCLUDE_DIRS} /usr/include /usr/local/include /opt/local/include /sw/include) diff --git a/cmake/Modules/FindLibavcodec.cmake b/cmake/Modules/FindLibavcodec.cmake index f5061ed90..d2a9ebd68 100644 --- a/cmake/Modules/FindLibavcodec.cmake +++ b/cmake/Modules/FindLibavcodec.cmake @@ -23,12 +23,15 @@ else() set(_lib_suffix 32) endif() + set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) + find_path(FFMPEG_INCLUDE_DIR NAMES libavcodec/avcodec.h HINTS "${CMAKE_SOURCE_DIR}/additional_install_files/include" "$ENV{obsAdditionalInstallFiles}/include" ENV FFmpegPath + ENV ${FFMPEG_PATH_ARCH} "${_AVCODEC_INCLUDE_DIRS}" /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -39,6 +42,7 @@ else() "${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${_AVCODEC_LIBRARY_DIRS}" /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibavformat.cmake b/cmake/Modules/FindLibavformat.cmake index 6a1e623bf..09a1b8e1b 100644 --- a/cmake/Modules/FindLibavformat.cmake +++ b/cmake/Modules/FindLibavformat.cmake @@ -19,12 +19,15 @@ else() set(_lib_suffix 32) endif() + set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) + find_path(FFMPEG_INCLUDE_DIR NAMES libavformat/avformat.h HINTS "${CMAKE_SOURCE_DIR}/additional_install_files/include" "$ENV{obsAdditionalInstallFiles}/include" ENV FFmpegPath + ENV ${FFMPEG_PATH_ARCH} "${_AVFORMAT_INCLUDE_DIRS}" /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -35,6 +38,7 @@ else() "${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${_AVFORMAT_LIBRARY_DIRS}" /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibavutil.cmake b/cmake/Modules/FindLibavutil.cmake index dab17186b..b6aba0d18 100644 --- a/cmake/Modules/FindLibavutil.cmake +++ b/cmake/Modules/FindLibavutil.cmake @@ -19,12 +19,15 @@ else() set(_lib_suffix 32) endif() + set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) + find_path(FFMPEG_INCLUDE_DIR NAMES libavutil/avutil.h HINTS "${CMAKE_SOURCE_DIR}/additional_install_files/include" "$ENV{obsAdditionalInstallFiles}/include" ENV FFmpegPath + ENV ${FFMPEG_PATH_ARCH} "${_AVUTIL_INCLUDE_DIRS}" /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -35,6 +38,7 @@ else() "${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${_AVUTIL_LIBRARY_DIRS}" /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibfdk.cmake b/cmake/Modules/FindLibfdk.cmake index 8132cddc2..dff77a13e 100644 --- a/cmake/Modules/FindLibfdk.cmake +++ b/cmake/Modules/FindLibfdk.cmake @@ -23,6 +23,9 @@ else() set(_lib_suffix 32) endif() + set(LIBFDK_PATH_ARCH LibfdkPath${_lib_suffix}) + set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) + find_path(Libfdk_INCLUDE_DIR NAMES fdk-aac/aacenc_lib.h HINTS @@ -30,6 +33,8 @@ else() "$ENV{obsAdditionalInstallFiles}/include" ENV LibfdkPath ENV FFmpegPath + ENV ${LIBFDK_PATH_ARCH} + ENV ${FFMPEG_PATH_ARCH} "${_LIBFDK_INCLUDE_DIRS}" /usr/include /usr/local/include /opt/local/include /sw/include) @@ -39,6 +44,7 @@ else() "${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}" /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibswresample.cmake b/cmake/Modules/FindLibswresample.cmake index ea2c22891..f45eb712b 100644 --- a/cmake/Modules/FindLibswresample.cmake +++ b/cmake/Modules/FindLibswresample.cmake @@ -19,12 +19,15 @@ else() set(_lib_suffix 32) endif() + set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) + find_path(FFMPEG_INCLUDE_DIR NAMES libswresample/swresample.h HINTS "${CMAKE_SOURCE_DIR}/additional_install_files/include" "$ENV{obsAdditionalInstallFiles}/include" ENV FFmpegPath + ENV ${FFMPEG_PATH_ARCH} "${_SWRESAMPLE_INCLUDE_DIRS}" /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -35,6 +38,7 @@ else() "${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${_SWRESAMPLE_LIBRARY_DIRS}" /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibswscale.cmake b/cmake/Modules/FindLibswscale.cmake index 1ebf67df3..854854625 100644 --- a/cmake/Modules/FindLibswscale.cmake +++ b/cmake/Modules/FindLibswscale.cmake @@ -19,12 +19,15 @@ else() set(_lib_suffix 32) endif() + set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) + find_path(FFMPEG_INCLUDE_DIR NAMES libswscale/swscale.h HINTS "${CMAKE_SOURCE_DIR}/additional_install_files/include" "$ENV{obsAdditionalInstallFiles}/include" ENV FFmpegPath + ENV ${FFMPEG_PATH_ARCH} "${_SWSCALE_INCLUDE_DIRS}" /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -35,6 +38,7 @@ else() "${FFMPEG_INCLUDE_DIR}/../lib" "${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}" "${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}" + "${FFMPEG_INCLUDE_DIR}/lib" "${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}" "${_SWSCALE_LIBRARY_DIRS}" /usr/lib /usr/local/lib /opt/local/lib /sw/lib) diff --git a/cmake/Modules/FindLibx264.cmake b/cmake/Modules/FindLibx264.cmake index 32c49d294..e4b35dfc3 100644 --- a/cmake/Modules/FindLibx264.cmake +++ b/cmake/Modules/FindLibx264.cmake @@ -23,6 +23,9 @@ else() set(_lib_suffix 32) endif() + set(X264_PATH_ARCH x264Path${_lib_suffix}) + set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) + find_path(X264_INCLUDE_DIR NAMES x264.h HINTS @@ -30,6 +33,8 @@ else() "$ENV{obsAdditionalInstallFiles}/include" ENV x264Path ENV FFmpegPath + ENV ${X264_PATH_ARCH} + ENV ${FFMPEG_PATH_ARCH} "${_X264_INCLUDE_DIRS}" /usr/include /usr/local/include /opt/local/include /sw/include) @@ -39,6 +44,7 @@ else() "${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}" /usr/lib /usr/local/lib /opt/local/lib /sw/lib)