--- CorsixTH/CMakeLists.txt.orig 2013-03-24 19:01:59.745454897 +0100 +++ CorsixTH/CMakeLists.txt 2013-03-24 19:03:14.618396915 +0100 @@ -88,6 +88,21 @@ # Finding libraries +# Find FFMPEG +IF(CORSIX_TH_USE_FFMPEG) + FIND_PACKAGE(FFmpeg COMPONENTS AVFORMAT AVCODEC AVUTIL SWSCALE SWRESAMPLE REQUIRED) + IF(FFMPEG_FOUND) + TARGET_LINK_LIBRARIES(CorsixTH ${FFMPEG_LIBRARIES}) + INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIRS}) + IF(APPLE) + TARGET_LINK_LIBRARIES(CorsixTH libz.dylib) + ENDIF() + message(" FFmpeg found") + ELSE(FFMPEG_FOUND) + message("Error: FFmpeg library not found, even though it was selected to be included") + ENDIF(FFMPEG_FOUND) +ENDIF(CORSIX_TH_USE_FFMPEG) + # Find SDL FIND_PACKAGE(SDL REQUIRED) IF(SDL_FOUND) @@ -131,21 +146,6 @@ message( STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}" ) -# Find FFMPEG -IF(CORSIX_TH_USE_FFMPEG) - FIND_PACKAGE(FFmpeg COMPONENTS AVFORMAT AVCODEC AVUTIL SWSCALE SWRESAMPLE REQUIRED) - IF(FFMPEG_FOUND) - TARGET_LINK_LIBRARIES(CorsixTH ${FFMPEG_LIBRARIES}) - INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIRS}) - IF(APPLE) - TARGET_LINK_LIBRARIES(CorsixTH libz.dylib) - ENDIF() - message(" FFmpeg found") - ELSE(FFMPEG_FOUND) - message("Error: FFmpeg library not found, even though it was selected to be included") - ENDIF(FFMPEG_FOUND) -ENDIF(CORSIX_TH_USE_FFMPEG) - # Find Freetype2 IF(CORSIX_TH_USE_FREETYPE2) FIND_PACKAGE(Freetype REQUIRED)