From 52f789436d67af4c027cc3a6bc796b670e0f6a16 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Tue, 14 Jan 2020 00:41:09 +0100 Subject: [PATCH] cmake: Fix native obs-studio builds --- CMakeLists.txt | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 993f873..4031a3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,32 +238,35 @@ elseif(${PropertyPrefix}OBS_REFERENCE) include("${OBS_STUDIO_DIR}/cmake/external/FindLibobs.cmake") elseif(${PropertyPrefix}OBS_DOWNLOAD) include("${libobs_SOURCE_DIR}/cmake/LibObs/LibObsConfig.cmake") -else() - message(CRITICAL "Impossible case reached, verify system stability.") - return() endif() # Load FFmpeg -find_path( - FFmpegPath "libavcodec/avcodec.h" - HINTS - ${OBS_DEPENDENCIES_DIR} - ${obsdeps_SOURCE_DIR} - PATHS - /usr/include - /usr/local/include - /opt/local/include - /sw/include - PATH_SUFFIXES - win${BITS} - win${BITS}/bin - win${BITS}/include - win${ARCH} - win${ARCH}/bin - win${ARCH}/include - bin - include -) +if(NOT ${PropertyPrefix}OBS_NATIVE) + find_path( + FFmpegPath "libavcodec/avcodec.h" + HINTS + ${OBS_DEPENDENCIES_DIR} + ${obsdeps_SOURCE_DIR} + ${DepsPath} + ${DepsPath32} + ${DepsPath64} + + PATHS + /usr/include + /usr/local/include + /opt/local/include + /sw/include + PATH_SUFFIXES + win${BITS} + win${BITS}/bin + win${BITS}/include + win${ARCH} + win${ARCH}/bin + win${ARCH}/include + bin + include + ) +endif() find_package(FFmpeg REQUIRED COMPONENTS avutil avcodec swscale) ################################################################################