Merge pull request #2080 from dforsi/fix/cmakefiles

Fix typos in CMakeLists
2024-04-22 19:30:24 +02:00 · 2024-04-21 21:41:42 +02:00
2 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -456,7 +456,7 @@ elseif(ANDROID)
  set(LIBDSDCC_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/dsdcc/lib/libdsdcc.so" CACHE INTERNAL "")

  set(FFMPEG_FOUND ON CACHE INTERNAL "")
-  set(FFMEG_SKIP_CHECK ON CACHE INTERNAL "")
+  set(FFMPEG_SKIP_CHECK ON CACHE INTERNAL "")
  set(FFMPEG_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
  set(FFMPEG_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/bin" CACHE INTERNAL "")
  set(AVCODEC_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
--- a/plugins/channelrx/CMakeLists.txt
+++ b/plugins/channelrx/CMakeLists.txt
@ -234,7 +234,7 @@ if(NOT SERVER_MODE)
      if(WIN32)
        add_subdirectory(demoddatv)
      else()
-        if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMEG_SKIP_CHECK)
+        if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMPEG_SKIP_CHECK)
            message(STATUS "Include demoddatv")
            add_subdirectory(demoddatv)
        else()
Author	SHA1	Message	Date
Edouard Griffiths	dac9b9a5b3	Merge pull request #2080 from dforsi/fix/cmakefiles Fix typos in CMakeLists	2024-04-22 19:30:24 +02:00
Daniele Forsi	90e917f666	Fix typos in CMakeLists s/FFMEG/FFMPEG/	2024-04-21 21:41:42 +02:00