Remove LOCAL from logs as this was part of the old convention

AOMediaCodec · Jan 6, 2025 · e0b7c9f · e0b7c9f
1 parent 5eaa316
commit e0b7c9f
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 41 deletions.
diff --git a/cmake/Modules/LocalAom.cmake b/cmake/Modules/LocalAom.cmake
@@ -1,5 +1,5 @@
-set(AVIF_LOCAL_AOM_GIT_TAG v3.11.0)
-set(AVIF_LOCAL_AVM_GIT_TAG research-v8.1.0)
+set(AVIF_AOM_GIT_TAG v3.11.0)
+set(AVIF_AVM_GIT_TAG research-v8.1.0)
 
 if(AVIF_CODEC_AVM)
     # Building the avm repository generates files such as "libaom.a" because it is a fork of aom,
@@ -93,7 +93,7 @@ else()
             libaom
             GIT_REPOSITORY "https://gitlab.com/AOMediaCodec/avm.git"
             BINARY_DIR "${AOM_BINARY_DIR}"
-            GIT_TAG ${AVIF_LOCAL_AVM_GIT_TAG}
+            GIT_TAG ${AVIF_AVM_GIT_TAG}
             GIT_PROGRESS ON
             GIT_SHALLOW ON
             UPDATE_COMMAND ""
@@ -102,7 +102,7 @@ else()
         set(CONFIG_ML_PART_SPLIT 0 CACHE INTERNAL "")
     else()
         FetchContent_Declare(
-            libaom URL "https://aomedia.googlesource.com/aom/+archive/${AVIF_LOCAL_AOM_GIT_TAG}.tar.gz" BINARY_DIR
+            libaom URL "https://aomedia.googlesource.com/aom/+archive/${AVIF_AOM_GIT_TAG}.tar.gz" BINARY_DIR
                        "${AOM_BINARY_DIR}" UPDATE_COMMAND ""
         )
     endif()

diff --git a/cmake/Modules/LocalDav1d.cmake b/cmake/Modules/LocalDav1d.cmake
@@ -1,4 +1,4 @@
-set(AVIF_LOCAL_DAV1D_TAG "1.5.0")
+set(AVIF_DAV1D_TAG "1.5.0")
 
 function(avif_build_local_dav1d)
     set(download_step_args)
@@ -9,7 +9,7 @@ function(avif_build_local_dav1d)
         message(STATUS "libavif(AVIF_CODEC_DAV1D=LOCAL): ext/dav1d not found, fetching")
         set(source_dir "${FETCHCONTENT_BASE_DIR}/dav1d-src")
         list(APPEND download_step_args GIT_REPOSITORY https://code.videolan.org/videolan/dav1d.git GIT_TAG
-             ${AVIF_LOCAL_DAV1D_TAG} GIT_SHALLOW ON
+             ${AVIF_DAV1D_TAG} GIT_SHALLOW ON
         )
     endif()
 

diff --git a/cmake/Modules/LocalGTest.cmake b/cmake/Modules/LocalGTest.cmake
@@ -1,4 +1,4 @@
-set(AVIF_LOCAL_GTEST_GIT_TAG v1.14.0)
+set(AVIF_GTEST_GIT_TAG v1.14.0)
 
 set(GTest_FOUND ON CACHE BOOL "")
 set(GTEST_INCLUDE_DIRS ${AVIF_SOURCE_DIR}/ext/googletest/googletest/include)
@@ -27,15 +27,15 @@ else()
     if(EXISTS "${AVIF_SOURCE_DIR}/ext/googletest")
         message(STATUS "libavif(AVIF_GTEST=LOCAL): ext/googletest found; using as FetchContent SOURCE_DIR")
         set(FETCHCONTENT_SOURCE_DIR_GOOGLETEST "${AVIF_SOURCE_DIR}/ext/googletest")
-        message(CHECK_START "libavif(AVIF_LOCAL_GTEST): configuring googletest")
+        message(CHECK_START "libavif(AVIF_GTEST): configuring googletest")
     else()
-        message(CHECK_START "libavif(AVIF_LOCAL_GTEST): fetching and configuring googletest")
+        message(CHECK_START "libavif(AVIF_GTEST): fetching and configuring googletest")
     endif()
 
     FetchContent_Declare(
         googletest
         GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG ${AVIF_LOCAL_GTEST_GIT_TAG}
+        GIT_TAG ${AVIF_GTEST_GIT_TAG}
         GIT_SHALLOW ON
     )
     set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)

diff --git a/cmake/Modules/LocalJpeg.cmake b/cmake/Modules/LocalJpeg.cmake
@@ -1,4 +1,4 @@
-set(AVIF_LOCAL_JPEG_TAG "3.0.4")
+set(AVIF_JPEG_TAG "3.0.4")
 
 add_library(JPEG::JPEG STATIC IMPORTED GLOBAL)
 
@@ -33,7 +33,7 @@ else()
         libjpeg
         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libjpeg
         GIT_REPOSITORY "https://github.com/libjpeg-turbo/libjpeg-turbo.git"
-        GIT_TAG "${AVIF_LOCAL_JPEG_TAG}"
+        GIT_TAG "${AVIF_JPEG_TAG}"
         LIST_SEPARATOR |
         BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> --target jpeg-static
         CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}

diff --git a/cmake/Modules/LocalLibXml2.cmake b/cmake/Modules/LocalLibXml2.cmake
@@ -1,4 +1,4 @@
-set(AVIF_LOCAL_LIBXML_GIT_TAG "v2.13.5")
+set(AVIF_LIBXML_GIT_TAG "v2.13.5")
 
 set(LIB_FILENAME "${AVIF_SOURCE_DIR}/ext/libxml2/install.libavif/lib/${AVIF_LIBRARY_PREFIX}xml2${CMAKE_STATIC_LIBRARY_SUFFIX}")
 if(EXISTS "${LIB_FILENAME}")
@@ -12,9 +12,9 @@ else()
     if(EXISTS "${AVIF_SOURCE_DIR}/ext/libxml2")
         message(STATUS "libavif(AVIF_LIBXML2=LOCAL): ext/libxml2 found; using as FetchContent SOURCE_DIR")
         set(FETCHCONTENT_SOURCE_DIR_LIBXML2 "${AVIF_SOURCE_DIR}/ext/libxml2")
-        message(CHECK_START "libavif(AVIF_LOCAL_LIBXML2): configuring libxml2")
+        message(CHECK_START "libavif(AVIF_LIBXML2): configuring libxml2")
     else()
-        message(CHECK_START "libavif(AVIF_LOCAL_LIBXML2): fetching and configuring libxml2")
+        message(CHECK_START "libavif(AVIF_LIBXML2): fetching and configuring libxml2")
     endif()
 
     set(LIBXML2_WITH_PYTHON OFF CACHE INTERNAL "-")
@@ -33,7 +33,7 @@ else()
         libxml2
         GIT_REPOSITORY "https://github.com/GNOME/libxml2.git"
         BINARY_DIR "${LIBXML2_BINARY_DIR}"
-        GIT_TAG "${AVIF_LOCAL_LIBXML_GIT_TAG}"
+        GIT_TAG "${AVIF_LIBXML_GIT_TAG}"
         GIT_SHALLOW ON
         UPDATE_COMMAND ""
     )

diff --git a/cmake/Modules/LocalLibargparse.cmake b/cmake/Modules/LocalLibargparse.cmake
@@ -1,28 +1,28 @@
-set(AVIF_LOCAL_LIBARGPARSE_GIT_TAG ee74d1b53bd680748af14e737378de57e2a0a954)
+set(AVIF_LIBARGPARSE_GIT_TAG ee74d1b53bd680748af14e737378de57e2a0a954)
 
 set(LIBARGPARSE_FILENAME
     "${AVIF_SOURCE_DIR}/ext/libargparse/build/${CMAKE_STATIC_LIBRARY_PREFIX}argparse${CMAKE_STATIC_LIBRARY_SUFFIX}"
 )
 
 if(EXISTS "${LIBARGPARSE_FILENAME}")
-    message(STATUS "libavif(AVIF_LOCAL_LIBARGPARSE): compiled library found at ${LIBARGPARSE_FILENAME}")
+    message(STATUS "libavif(AVIF_LIBARGPARSE): compiled library found at ${LIBARGPARSE_FILENAME}")
     add_library(libargparse STATIC IMPORTED GLOBAL)
     set_target_properties(libargparse PROPERTIES IMPORTED_LOCATION "${LIBARGPARSE_FILENAME}" AVIF_LOCAL ON)
     target_include_directories(libargparse INTERFACE "${AVIF_SOURCE_DIR}/ext/libargparse/src")
 else()
-    message(STATUS "libavif(AVIF_LOCAL_LIBARGPARSE): compiled library not found at ${LIBARGPARSE_FILENAME}; using FetchContent")
+    message(STATUS "libavif(AVIF_LIBARGPARSE): compiled library not found at ${LIBARGPARSE_FILENAME}; using FetchContent")
     if(EXISTS "${AVIF_SOURCE_DIR}/ext/libargparse")
-        message(STATUS "libavif(AVIF_LOCAL_LIBARGPARSE): ext/libargparse found; using as FetchContent SOURCE_DIR")
+        message(STATUS "libavif(AVIF_LIBARGPARSE): ext/libargparse found; using as FetchContent SOURCE_DIR")
         set(FETCHCONTENT_SOURCE_DIR_LIBARGPARSE "${AVIF_SOURCE_DIR}/ext/libargparse")
-        message(CHECK_START "libavif(AVIF_LOCAL_LIBARGPARSE): configuring libargparse")
+        message(CHECK_START "libavif(AVIF_LIBARGPARSE): configuring libargparse")
     else()
-        message(CHECK_START "libavif(AVIF_LOCAL_LIBARGPARSE): fetching and configuring libargparse")
+        message(CHECK_START "libavif(AVIF_LIBARGPARSE): fetching and configuring libargparse")
     endif()
 
     FetchContent_Declare(
         libargparse
         GIT_REPOSITORY "https://github.com/kmurray/libargparse.git"
-        GIT_TAG ${AVIF_LOCAL_LIBARGPARSE_GIT_TAG}
+        GIT_TAG ${AVIF_LIBARGPARSE_GIT_TAG}
         # TODO(vrabaud) remove once CMake 3.13 is not supported anymore.
         PATCH_COMMAND
             sed -i.bak -e

diff --git a/cmake/Modules/LocalLibgav1.cmake b/cmake/Modules/LocalLibgav1.cmake
@@ -1,4 +1,4 @@
-set(AVIF_LOCAL_LIBGAV1_GIT_TAG "v0.19.0")
+set(AVIF_LIBGAV1_GIT_TAG "v0.19.0")
 
 set(AVIF_LIBGAV1_BUILD_DIR "${AVIF_SOURCE_DIR}/ext/libgav1/build")
 # If ${ANDROID_ABI} is set, look for the library under that subdirectory.
@@ -37,7 +37,7 @@ else()
         libgav1
         GIT_REPOSITORY "https://chromium.googlesource.com/codecs/libgav1"
         BINARY_DIR "${LIBGAV1_BINARY_DIR}"
-        GIT_TAG "${AVIF_LOCAL_LIBGAV1_GIT_TAG}"
+        GIT_TAG "${AVIF_LIBGAV1_GIT_TAG}"
         GIT_SHALLOW ON
         UPDATE_COMMAND ""
     )

diff --git a/cmake/Modules/LocalLibsharpyuv.cmake b/cmake/Modules/LocalLibsharpyuv.cmake
@@ -1,4 +1,4 @@
-set(AVIF_LOCAL_LIBSHARPYUV_GIT_TAG v1.4.0)
+set(AVIF_LIBSHARPYUV_GIT_TAG v1.4.0)
 
 set(LIB_FILENAME "${CMAKE_CURRENT_SOURCE_DIR}/ext/libwebp/build/libsharpyuv${CMAKE_STATIC_LIBRARY_SUFFIX}")
 if(EXISTS "${LIB_FILENAME}")
@@ -39,7 +39,7 @@ else()
         libwebp
         GIT_REPOSITORY "https://chromium.googlesource.com/webm/libwebp"
         BINARY_DIR "${LIBSHARPYUV_BINARY_DIR}"
-        GIT_TAG "${AVIF_LOCAL_LIBSHARPYUV_GIT_TAG}"
+        GIT_TAG "${AVIF_LIBSHARPYUV_GIT_TAG}"
         GIT_SHALLOW ON
         UPDATE_COMMAND ""
     )

diff --git a/cmake/Modules/LocalLibyuv.cmake b/cmake/Modules/LocalLibyuv.cmake
@@ -1,4 +1,4 @@
-set(AVIF_LOCAL_LIBYUV_TAG "a6a2ec654b1be1166b376476a7555c89eca0c275")
+set(AVIF_LIBYUV_TAG "a6a2ec654b1be1166b376476a7555c89eca0c275")
 
 set(AVIF_LIBYUV_BUILD_DIR "${AVIF_SOURCE_DIR}/ext/libyuv/build")
 # If ${ANDROID_ABI} is set, look for the library under that subdirectory.
@@ -39,7 +39,7 @@ else()
         libyuv
         GIT_REPOSITORY "https://chromium.googlesource.com/libyuv/libyuv"
         BINARY_DIR "${LIBYUV_BINARY_DIR}"
-        GIT_TAG "${AVIF_LOCAL_LIBYUV_TAG}"
+        GIT_TAG "${AVIF_LIBYUV_TAG}"
         UPDATE_COMMAND ""
     )
 

diff --git a/cmake/Modules/LocalRav1e.cmake b/cmake/Modules/LocalRav1e.cmake
@@ -1,6 +1,6 @@
-set(AVIF_LOCAL_RAV1E_GIT_TAG v0.7.1)
-set(AVIF_LOCAL_CORROSION_GIT_TAG v0.5.0)
-set(AVIF_LOCAL_CARGOC_GIT_TAG v0.10.2)
+set(AVIF_RAV1E_GIT_TAG v0.7.1)
+set(AVIF_CORROSION_GIT_TAG v0.5.0)
+set(AVIF_CARGOC_GIT_TAG v0.10.2)
 
 set(RAV1E_LIB_FILENAME
     "${AVIF_SOURCE_DIR}/ext/rav1e/build.libavif/usr/lib/${AVIF_LIBRARY_PREFIX}rav1e${CMAKE_STATIC_LIBRARY_SUFFIX}"
@@ -26,7 +26,7 @@ else()
     FetchContent_Declare(
         Corrosion
         GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
-        GIT_TAG ${AVIF_LOCAL_CORROSION_GIT_TAG}
+        GIT_TAG ${AVIF_CORROSION_GIT_TAG}
         GIT_SHALLOW ON
     )
 
@@ -49,7 +49,7 @@ else()
         FetchContent_Declare(
             cargoc
             GIT_REPOSITORY https://github.com/lu-zero/cargo-c.git
-            GIT_TAG "${AVIF_LOCAL_CARGOC_GIT_TAG}"
+            GIT_TAG "${AVIF_CARGOC_GIT_TAG}"
             GIT_SHALLOW ON
         )
         FetchContent_MakeAvailable(cargoc)
@@ -65,7 +65,7 @@ else()
     FetchContent_Declare(
         rav1e
         GIT_REPOSITORY https://github.com/xiph/rav1e.git
-        GIT_TAG "${AVIF_LOCAL_RAV1E_GIT_TAG}"
+        GIT_TAG "${AVIF_RAV1E_GIT_TAG}"
         GIT_SHALLOW ON
     )
     FetchContent_MakeAvailable(rav1e)

diff --git a/cmake/Modules/LocalSvt.cmake b/cmake/Modules/LocalSvt.cmake
@@ -1,4 +1,4 @@
-set(AVIF_LOCAL_SVT_GIT_TAG "v2.2.1")
+set(AVIF_SVT_GIT_TAG "v2.2.1")
 
 set(LIB_FILENAME "${AVIF_SOURCE_DIR}/ext/SVT-AV1/Bin/Release/${AVIF_LIBRARY_PREFIX}SvtAv1Enc${CMAKE_STATIC_LIBRARY_SUFFIX}")
 
@@ -42,7 +42,7 @@ else()
         svt
         GIT_REPOSITORY "https://gitlab.com/AOMediaCodec/SVT-AV1.git"
         BINARY_DIR "${SVT_BINARY_DIR}"
-        GIT_TAG "${AVIF_LOCAL_SVT_GIT_TAG}"
+        GIT_TAG "${AVIF_SVT_GIT_TAG}"
         UPDATE_COMMAND ""
         GIT_SHALLOW ON
     )

diff --git a/cmake/Modules/LocalZlibpng.cmake b/cmake/Modules/LocalZlibpng.cmake
@@ -1,7 +1,7 @@
 # To upgrade libpng to > v1.6.40, you need zlib containing f1f503da85d52e56aae11557b4d79a42bcaa2b86
 # hence a version > v1.3.1 .
-set(AVIF_LOCAL_ZLIB_GIT_TAG v1.3.1)
-set(AVIF_LOCAL_LIBPNG_GIT_TAG v1.6.40)
+set(AVIF_ZLIB_GIT_TAG v1.3.1)
+set(AVIF_LIBPNG_GIT_TAG v1.6.40)
 
 if(EXISTS "${AVIF_SOURCE_DIR}/ext/zlib")
     message(STATUS "libavif(AVIF_ZLIBPNG=LOCAL): ext/zlib found; using as FetchContent SOURCE_DIR")
@@ -22,7 +22,7 @@ FetchContent_Declare(
     zlib
     GIT_REPOSITORY "https://github.com/madler/zlib.git"
     SOURCE_DIR "${ZLIB_SOURCE_DIR}" BINARY_DIR "${ZLIB_BINARY_DIR}"
-    GIT_TAG "${AVIF_LOCAL_ZLIB_GIT_TAG}"
+    GIT_TAG "${AVIF_ZLIB_GIT_TAG}"
     GIT_SHALLOW ON
     UPDATE_COMMAND ""
 )
@@ -90,7 +90,7 @@ FetchContent_Declare(
     libpng
     GIT_REPOSITORY "https://github.com/glennrp/libpng.git"
     BINARY_DIR "${LIBPNG_BINARY_DIR}"
-    GIT_TAG "${AVIF_LOCAL_LIBPNG_GIT_TAG}"
+    GIT_TAG "${AVIF_LIBPNG_GIT_TAG}"
     GIT_SHALLOW ON
     UPDATE_COMMAND ""
 )