From 8b555bfb308a6f0b5f8aac7225a3b56607f3f935 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 1 Dec 2016 17:12:52 -0500 Subject: [PATCH] Allow WITH_FFMPEG to work when disabled for Mac. --- src/CMakeData-arch.cmake | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/CMakeData-arch.cmake b/src/CMakeData-arch.cmake index e23e5036e7..35fb59313e 100644 --- a/src/CMakeData-arch.cmake +++ b/src/CMakeData-arch.cmake @@ -125,12 +125,14 @@ list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP ) if(APPLE) - list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC - "arch/MovieTexture/MovieTexture_FFMpeg.cpp" - ) - list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP - "arch/MovieTexture/MovieTexture_FFMpeg.h" - ) + if (${HAS_FFMPEG}) + list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC + "arch/MovieTexture/MovieTexture_FFMpeg.cpp" + ) + list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP + "arch/MovieTexture/MovieTexture_FFMpeg.h" + ) + endif() elseif(MSVC) list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC "arch/MovieTexture/MovieTexture_FFMpeg.cpp" @@ -281,7 +283,7 @@ if(NOT APPLE) list(APPEND SMDATA_ARCH_LIGHTS_HPP "arch/Lights/LightsDriver_Export.h" ) - + if(WIN32) list(APPEND SMDATA_ARCH_LIGHTS_SRC "arch/Lights/LightsDriver_Win32Parallel.cpp" @@ -501,4 +503,3 @@ list(APPEND SMDATA_ALL_ARCH_HPP ${SMDATA_ARCH_SOUND_HPP} ${SMDATA_ARCH_THREADS_HPP} ) -