diff --git a/cmake/Modules/CopyMSVCBins.cmake b/cmake/Modules/CopyMSVCBins.cmake index 9975ec390..a400dba20 100644 --- a/cmake/Modules/CopyMSVCBins.cmake +++ b/cmake/Modules/CopyMSVCBins.cmake @@ -8,11 +8,6 @@ if(COPIED_DEPENDENCIES) return() endif() -# Do not attempt to copy if an external intall files dir is in use -if(DEFINED ENV{obsAdditionalInstallFiles}) - return() -endif() - option(COPY_DEPENDENCIES "Automaticaly try copying all dependencies" OFF) if(NOT COPY_DEPENDENCIES) return() diff --git a/cmake/Modules/FindFreetype.cmake b/cmake/Modules/FindFreetype.cmake index 421fb2b3d..44aee2985 100644 --- a/cmake/Modules/FindFreetype.cmake +++ b/cmake/Modules/FindFreetype.cmake @@ -19,12 +19,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build NAMES ft2build.h HINTS - ${_FREETYPE_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" ENV FreetypePath${_lib_suffix} ENV FreetypePath ENV FREETYPE_DIR + ${_FREETYPE_INCLUDE_DIRS} PATHS /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES @@ -35,12 +33,10 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h config/ftheader.h HINTS - ${_FREETYPE_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" ENV FreetypePath${_lib_suffix} ENV FreetypePath ENV FREETYPE_DIR + ${_FREETYPE_INCLUDE_DIRS} PATHS /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES @@ -49,24 +45,19 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 find_library(FREETYPE_LIB NAMES ${_FREETYPE_LIBRARIES} freetype libfreetype HINTS - ${_FREETYPE_LIBRARY_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/lib${_lib_suffix}" - "$ENV{obsAdditionalInstallFiles}/lib${_lib_suffix}" - "${FREETYPE_INCLUDE_DIR_ft2build}/../../lib${_lib_suffix}" - "${FREETYPE_INCLUDE_DIR_ft2build}/../../lib" - "${FREETYPE_INCLUDE_DIR_ft2build}/../lib${_lib_suffix}" - "${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 FreetypePath${_lib_suffix} + ENV FreetypePath ENV FREETYPE_DIR + ${_FREETYPE_LIBRARY_DIRS} PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib PATH_SUFFIXES - lib${_lib_suffix} lib) + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin + ../lib${_lib_suffix} ../lib + ../libs${_lib_suffix} ../libs + ../bin${_lib_suffix} ../bin) if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2) set(FREETYPE_INCLUDE_DIR "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}") diff --git a/cmake/Modules/FindIconv.cmake b/cmake/Modules/FindIconv.cmake index 82d71288c..7a2c9a218 100644 --- a/cmake/Modules/FindIconv.cmake +++ b/cmake/Modules/FindIconv.cmake @@ -15,16 +15,12 @@ else() set(_lib_suffix 32) endif() -set(ICONV_PATH_ARCH IconvPath${_lib_suffix}) - find_path(ICONV_INCLUDE_DIR NAMES iconv.h HINTS - ${_ICONV_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" + ENV IconvPath${_lib_suffix} ENV IconvPath - ENV ${ICONV_PATH_ARCH} + ${_ICONV_INCLUDE_DIRS} PATHS /usr/include /usr/local/include /opt/local/include /sw/include) @@ -32,13 +28,12 @@ find_library(ICONV_LIB NAMES ${_ICONV_LIBRARIES} iconv libiconv HINTS ${_ICONV_LIBRARY_DIRS} - "${ICONV_INCLUDE_DIR}/../lib${_lib_suffix}" - "${ICONV_INCLUDE_DIR}/../lib" - "${ICONV_INCLUDE_DIR}/../libs${_lib_suffix}" - "${ICONV_INCLUDE_DIR}/lib" - "${ICONV_INCLUDE_DIR}/lib${_lib_suffix}" PATHS - /usr/lib /usr/local/lib /opt/local/lib /sw/lib) + /usr/lib /usr/local/lib /opt/local/lib /sw/lib + PATH_SUFFIXES + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Iconv DEFAULT_MSG ICONV_LIB ICONV_INCLUDE_DIR) diff --git a/cmake/Modules/FindJansson.cmake b/cmake/Modules/FindJansson.cmake index 7c74ff120..82520be9c 100644 --- a/cmake/Modules/FindJansson.cmake +++ b/cmake/Modules/FindJansson.cmake @@ -16,25 +16,30 @@ else() set(_lib_suffix 32) endif() -set(JANSSON_PATH_ARCH JanssonPath${_lib_suffix}) - find_path(Jansson_INCLUDE_DIR NAMES jansson.h HINTS - ${_JANSSON_INCLUDE_DIRS} + ENV JanssonPath${_lib_suffix} 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_LIBRARIES} jansson libjansson HINTS + ENV JanssonPath${_lib_suffix} + ENV JanssonPath ${_JANSSON_LIBRARY_DIRS} - "${Jansson_INCLUDE_DIR}/../lib" - "${Jansson_INCLUDE_DIR}/lib${_lib_suffix}" PATHS - /usr/lib /usr/local/lib /opt/local/lib /sw/lib) + /usr/lib /usr/local/lib /opt/local/lib /sw/lib + PATH_SUFFIXES + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin + ../lib${_lib_suffix} ../lib + ../libs${_lib_suffix} ../libs + ../bin${_lib_suffix} ../bin) if(JANSSON_VERSION) set(_JANSSON_VERSION_STRING "${JANSSON_VERSION}") diff --git a/cmake/Modules/FindLibavcodec.cmake b/cmake/Modules/FindLibavcodec.cmake index 020d34a3b..008c64b29 100644 --- a/cmake/Modules/FindLibavcodec.cmake +++ b/cmake/Modules/FindLibavcodec.cmake @@ -19,16 +19,12 @@ else() set(_lib_suffix 32) endif() -set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) - find_path(FFMPEG_INCLUDE_DIR NAMES libavcodec/avcodec.h HINTS - ${_AVCODEC_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" + ENV FFmpegPath${_lib_suffix} ENV FFmpegPath - ENV ${FFMPEG_PATH_ARCH} + ${_AVCODEC_INCLUDE_DIRS} PATHS /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -36,18 +32,15 @@ find_path(FFMPEG_INCLUDE_DIR find_library(AVCODEC_LIB NAMES ${_AVCODEC_LIBRARIES} avcodec-ffmpeg avcodec HINTS + ENV FFmpegPath${_lib_suffix} + ENV FFmpegPath ${_AVCODEC_LIBRARY_DIRS} - "${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}" - "${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) + /usr/lib /usr/local/lib /opt/local/lib /sw/lib + PATH_SUFFIXES + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libavcodec DEFAULT_MSG AVCODEC_LIB FFMPEG_INCLUDE_DIR) diff --git a/cmake/Modules/FindLibavformat.cmake b/cmake/Modules/FindLibavformat.cmake index 3fe0779fd..be0b898fd 100644 --- a/cmake/Modules/FindLibavformat.cmake +++ b/cmake/Modules/FindLibavformat.cmake @@ -15,16 +15,12 @@ else() set(_lib_suffix 32) endif() -set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) - find_path(FFMPEG_INCLUDE_DIR NAMES libavformat/avformat.h HINTS - ${_AVFORMAT_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" + ENV FFmpegPath${_lib_suffix} ENV FFmpegPath - ENV ${FFMPEG_PATH_ARCH} + ${_AVFORMAT_INCLUDE_DIRS} PATHS /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -32,18 +28,15 @@ find_path(FFMPEG_INCLUDE_DIR find_library(AVFORMAT_LIB NAMES ${_AVFORMAT_LIBRARIES} avformat-ffmpeg avformat HINTS + ENV FFmpegPath${_lib_suffix} + ENV FFmpegPath ${_AVFORMAT_LIBRARY_DIRS} - "${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}" - "${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) + /usr/lib /usr/local/lib /opt/local/lib /sw/lib + PATH_SUFFIXES + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libavformat DEFAULT_MSG AVFORMAT_LIB FFMPEG_INCLUDE_DIR) diff --git a/cmake/Modules/FindLibavutil.cmake b/cmake/Modules/FindLibavutil.cmake index 99cd2d6cd..6b4350b09 100644 --- a/cmake/Modules/FindLibavutil.cmake +++ b/cmake/Modules/FindLibavutil.cmake @@ -15,16 +15,12 @@ else() set(_lib_suffix 32) endif() -set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) - find_path(FFMPEG_INCLUDE_DIR NAMES libavutil/avutil.h HINTS - ${_AVUTIL_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" + ENV FFmpegPath${_lib_suffix} ENV FFmpegPath - ENV ${FFMPEG_PATH_ARCH} + ${_AVUTIL_INCLUDE_DIRS} PATHS /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -32,18 +28,15 @@ find_path(FFMPEG_INCLUDE_DIR find_library(AVUTIL_LIB NAMES ${_AVUTIL_LIBRARIES} avutil-ffmpeg avutil HINTS + ENV FFmpegPath${_lib_suffix} + ENV FFmpegPath ${_AVUTIL_LIBRARY_DIRS} - "${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}" - "${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) + /usr/lib /usr/local/lib /opt/local/lib /sw/lib + PATH_SUFFIXES + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libavutil DEFAULT_MSG AVUTIL_LIB FFMPEG_INCLUDE_DIR) diff --git a/cmake/Modules/FindLibfdk.cmake b/cmake/Modules/FindLibfdk.cmake index b68f3c965..9156e73d7 100644 --- a/cmake/Modules/FindLibfdk.cmake +++ b/cmake/Modules/FindLibfdk.cmake @@ -19,37 +19,30 @@ 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 - ${_LIBFDK_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" + ENV LibfdkPath${_lib_suffix} 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 ${_LIBFDK_LIBRARIES} fdk-aac libfdk-aac HINTS + ENV LibfdkPath${_lib_suffix} + ENV LibfdkPath ${_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_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) + /usr/lib /usr/local/lib /opt/local/lib /sw/lib + PATH_SUFFIXES + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin + ../lib${_lib_suffix} ../lib + ../libs${_lib_suffix} ../libs + ../bin${_lib_suffix} ../bin) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libfdk DEFAULT_MSG Libfdk_LIB Libfdk_INCLUDE_DIR) diff --git a/cmake/Modules/FindLibswresample.cmake b/cmake/Modules/FindLibswresample.cmake index d8803dbf8..84423eace 100644 --- a/cmake/Modules/FindLibswresample.cmake +++ b/cmake/Modules/FindLibswresample.cmake @@ -15,16 +15,12 @@ else() set(_lib_suffix 32) endif() -set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) - find_path(FFMPEG_INCLUDE_DIR NAMES libswresample/swresample.h HINTS - ${_SWRESAMPLE_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" + ENV FFmpegPath${_lib_suffix} ENV FFmpegPath - ENV ${FFMPEG_PATH_ARCH} + ${_SWRESAMPLE_INCLUDE_DIRS} PATHS /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -32,18 +28,15 @@ find_path(FFMPEG_INCLUDE_DIR find_library(SWRESAMPLE_LIB NAMES ${_SWRESAMPLE_LIBRARIES} swresample-ffmpeg swresample HINTS + ENV FFmpegPath${_lib_suffix} + ENV FFmpegPath ${_SWRESAMPLE_LIBRARY_DIRS} - "${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}" - "${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) + /usr/lib /usr/local/lib /opt/local/lib /sw/lib + PATH_SUFFIXES + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libswresample DEFAULT_MSG SWRESAMPLE_LIB FFMPEG_INCLUDE_DIR) diff --git a/cmake/Modules/FindLibswscale.cmake b/cmake/Modules/FindLibswscale.cmake index d02f138d7..8c52f9872 100644 --- a/cmake/Modules/FindLibswscale.cmake +++ b/cmake/Modules/FindLibswscale.cmake @@ -15,16 +15,12 @@ else() set(_lib_suffix 32) endif() -set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix}) - find_path(FFMPEG_INCLUDE_DIR NAMES libswscale/swscale.h HINTS - ${_SWSCALE_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" + ENV FFmpegPath${_lib_suffix} ENV FFmpegPath - ENV ${FFMPEG_PATH_ARCH} + ${_SWSCALE_INCLUDE_DIRS} PATHS /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES ffmpeg libav) @@ -32,18 +28,15 @@ find_path(FFMPEG_INCLUDE_DIR find_library(SWSCALE_LIB NAMES ${_SWSCALE_LIBRARIES} swscale-ffmpeg swscale HINTS + ENV FFmpegPath${_lib_suffix} + ENV FFmpegPath ${_SWSCALE_LIBRARY_DIRS} - "${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}" - "${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) + /usr/lib /usr/local/lib /opt/local/lib /sw/lib + PATH_SUFFIXES + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libswscale DEFAULT_MSG SWSCALE_LIB FFMPEG_INCLUDE_DIR) diff --git a/cmake/Modules/FindLibx264.cmake b/cmake/Modules/FindLibx264.cmake index 63769dca0..a40312d96 100644 --- a/cmake/Modules/FindLibx264.cmake +++ b/cmake/Modules/FindLibx264.cmake @@ -19,37 +19,30 @@ 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 - ${_X264_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/additional_install_files/include" - "$ENV{obsAdditionalInstallFiles}/include" + ENV x264Path${_lib_suffix} 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_LIBRARIES} x264 libx264 HINTS + ENV x264Path${_lib_suffix} + ENV x264Path ${_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_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) + /usr/lib /usr/local/lib /opt/local/lib /sw/lib + PATH_SUFFIXES + lib${_lib_suffix} lib + libs${_lib_suffix} libs + bin${_lib_suffix} bin + ../lib${_lib_suffix} ../lib + ../libs${_lib_suffix} ../libs + ../bin${_lib_suffix} ../bin) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libx264 DEFAULT_MSG X264_LIB X264_INCLUDE_DIR) diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index 9260997de..25783d2ac 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -28,8 +28,22 @@ endif() if(DEFINED ENV{obsAdditionalInstallFiles}) file(TO_CMAKE_PATH "$ENV{obsAdditionalInstallFiles}" ENV{obsAdditionalInstallFiles}) +else() + set(ENV{obsAdditionalInstallFiles} "${CMAKE_SOURCE_DIR}/additional_install_files") endif() +list(APPEND CMAKE_INCLUDE_PATH + "$ENV{obsAdditionalInstallFiles}/include${_lib_suffix}" + "$ENV{obsAdditionalInstallFiles}/include") + +list(APPEND CMAKE_LIBRARY_PATH + "$ENV{obsAdditionalInstallFiles}/lib${_lib_suffix}" + "$ENV{obsAdditionalInstallFiles}/lib" + "$ENV{obsAdditionalInstallFiles}/libs${_lib_suffix}" + "$ENV{obsAdditionalInstallFiles}/libs" + "$ENV{obsAdditionalInstallFiles}/bin${_lib_suffix}" + "$ENV{obsAdditionalInstallFiles}/bin") + if(NOT UNIX_STRUCTURE) set(OBS_DATA_DESTINATION "data") if(APPLE)