From 0465664ea14e40b3598e3b28fae2761f2173a40d Mon Sep 17 00:00:00 2001 From: halx99 Date: Sat, 13 Aug 2022 09:51:21 +0800 Subject: [PATCH] Rename jpeg-turbo folder --- thirdparty/CMakeLists.txt | 4 ++-- thirdparty/README.md | 2 +- thirdparty/{jpeg => jpeg-turbo}/CMakeLists.txt | 2 +- thirdparty/{jpeg => jpeg-turbo}/include/jconfig.h | 0 thirdparty/{jpeg => jpeg-turbo}/include/jerror.h | 0 thirdparty/{jpeg => jpeg-turbo}/include/jmorecfg.h | 0 thirdparty/{jpeg => jpeg-turbo}/include/jpeglib.h | 0 .../{jpeg => jpeg-turbo}/include/unix/jconfig.h | 0 .../{jpeg => jpeg-turbo}/include/win32/jconfig.h | 0 .../prebuilt/android/arm64-v8a/libjpeg.a | Bin .../prebuilt/android/armeabi-v7a/libjpeg.a | Bin .../prebuilt/android/x86/libjpeg.a | Bin .../{jpeg => jpeg-turbo}/prebuilt/ios/libjpeg.a | Bin .../prebuilt/linux/x64/libjpeg.a | Bin .../{jpeg => jpeg-turbo}/prebuilt/mac/libjpeg.a | Bin .../prebuilt/windows/x64/jpeg-static.lib | Bin .../prebuilt/windows/x86/jpeg-static.lib | Bin 17 files changed, 4 insertions(+), 4 deletions(-) rename thirdparty/{jpeg => jpeg-turbo}/CMakeLists.txt (95%) rename thirdparty/{jpeg => jpeg-turbo}/include/jconfig.h (100%) rename thirdparty/{jpeg => jpeg-turbo}/include/jerror.h (100%) rename thirdparty/{jpeg => jpeg-turbo}/include/jmorecfg.h (100%) rename thirdparty/{jpeg => jpeg-turbo}/include/jpeglib.h (100%) rename thirdparty/{jpeg => jpeg-turbo}/include/unix/jconfig.h (100%) rename thirdparty/{jpeg => jpeg-turbo}/include/win32/jconfig.h (100%) rename thirdparty/{jpeg => jpeg-turbo}/prebuilt/android/arm64-v8a/libjpeg.a (100%) rename thirdparty/{jpeg => jpeg-turbo}/prebuilt/android/armeabi-v7a/libjpeg.a (100%) rename thirdparty/{jpeg => jpeg-turbo}/prebuilt/android/x86/libjpeg.a (100%) rename thirdparty/{jpeg => jpeg-turbo}/prebuilt/ios/libjpeg.a (100%) rename thirdparty/{jpeg => jpeg-turbo}/prebuilt/linux/x64/libjpeg.a (100%) rename thirdparty/{jpeg => jpeg-turbo}/prebuilt/mac/libjpeg.a (100%) rename thirdparty/{jpeg => jpeg-turbo}/prebuilt/windows/x64/jpeg-static.lib (100%) rename thirdparty/{jpeg => jpeg-turbo}/prebuilt/windows/x86/jpeg-static.lib (100%) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index af15233f69..14e80829ec 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -146,7 +146,7 @@ if(AX_WITH_JPEG) # set(JTURBO_BUILD_TESTS FALSE CACHE BOOL "Build TurboJPEG tests and examples" FORCE) # set(JTURBO_BUILD_BINARIES FALSE CACHE BOOL "Build TurboJPEG binaries" FORCE) # set(WITH_CRT_DLL TRUE CACHE BOOL "Build TurboJPEG with crt dll" FORCE) - add_subdirectory(jpeg) + add_subdirectory(jpeg-turbo) # configure_target_outdir(jpeg) # configure_target_outdir(simd) # if(TARGET simd-objs) @@ -155,7 +155,7 @@ if(AX_WITH_JPEG) # if(TARGET jsimdcfg) # configure_target_outdir(jsimdcfg) # endif() - target_link_libraries(thirdparty dep_jpeg) + target_link_libraries(thirdparty dep_jpeg-turbo) # target_include_directories(thirdparty INTERFACE # "${CMAKE_CURRENT_LIST_DIR}/jpeg" # "${JPEG_CONFIG_OUT_DIR}") diff --git a/thirdparty/README.md b/thirdparty/README.md index 31d253be59..796f472be3 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -90,7 +90,7 @@ - Version: v4.0.0 - License: MIT-like -## jpeg (libjpeg-turbo) +## jpeg-turbo - Upstream: https://github.com/libjpeg-turbo/libjpeg-turbo - Version: 2.1.3 - License: BSD-style (IJG,BSD-3-Clause,zlib) diff --git a/thirdparty/jpeg/CMakeLists.txt b/thirdparty/jpeg-turbo/CMakeLists.txt similarity index 95% rename from thirdparty/jpeg/CMakeLists.txt rename to thirdparty/jpeg-turbo/CMakeLists.txt index 07813c4784..1f47c42143 100644 --- a/thirdparty/jpeg/CMakeLists.txt +++ b/thirdparty/jpeg-turbo/CMakeLists.txt @@ -1,5 +1,5 @@ -set(lib_name jpeg) +set(lib_name jpeg-turbo) set(target_name dep_${lib_name}) project(${lib_name}) diff --git a/thirdparty/jpeg/include/jconfig.h b/thirdparty/jpeg-turbo/include/jconfig.h similarity index 100% rename from thirdparty/jpeg/include/jconfig.h rename to thirdparty/jpeg-turbo/include/jconfig.h diff --git a/thirdparty/jpeg/include/jerror.h b/thirdparty/jpeg-turbo/include/jerror.h similarity index 100% rename from thirdparty/jpeg/include/jerror.h rename to thirdparty/jpeg-turbo/include/jerror.h diff --git a/thirdparty/jpeg/include/jmorecfg.h b/thirdparty/jpeg-turbo/include/jmorecfg.h similarity index 100% rename from thirdparty/jpeg/include/jmorecfg.h rename to thirdparty/jpeg-turbo/include/jmorecfg.h diff --git a/thirdparty/jpeg/include/jpeglib.h b/thirdparty/jpeg-turbo/include/jpeglib.h similarity index 100% rename from thirdparty/jpeg/include/jpeglib.h rename to thirdparty/jpeg-turbo/include/jpeglib.h diff --git a/thirdparty/jpeg/include/unix/jconfig.h b/thirdparty/jpeg-turbo/include/unix/jconfig.h similarity index 100% rename from thirdparty/jpeg/include/unix/jconfig.h rename to thirdparty/jpeg-turbo/include/unix/jconfig.h diff --git a/thirdparty/jpeg/include/win32/jconfig.h b/thirdparty/jpeg-turbo/include/win32/jconfig.h similarity index 100% rename from thirdparty/jpeg/include/win32/jconfig.h rename to thirdparty/jpeg-turbo/include/win32/jconfig.h diff --git a/thirdparty/jpeg/prebuilt/android/arm64-v8a/libjpeg.a b/thirdparty/jpeg-turbo/prebuilt/android/arm64-v8a/libjpeg.a similarity index 100% rename from thirdparty/jpeg/prebuilt/android/arm64-v8a/libjpeg.a rename to thirdparty/jpeg-turbo/prebuilt/android/arm64-v8a/libjpeg.a diff --git a/thirdparty/jpeg/prebuilt/android/armeabi-v7a/libjpeg.a b/thirdparty/jpeg-turbo/prebuilt/android/armeabi-v7a/libjpeg.a similarity index 100% rename from thirdparty/jpeg/prebuilt/android/armeabi-v7a/libjpeg.a rename to thirdparty/jpeg-turbo/prebuilt/android/armeabi-v7a/libjpeg.a diff --git a/thirdparty/jpeg/prebuilt/android/x86/libjpeg.a b/thirdparty/jpeg-turbo/prebuilt/android/x86/libjpeg.a similarity index 100% rename from thirdparty/jpeg/prebuilt/android/x86/libjpeg.a rename to thirdparty/jpeg-turbo/prebuilt/android/x86/libjpeg.a diff --git a/thirdparty/jpeg/prebuilt/ios/libjpeg.a b/thirdparty/jpeg-turbo/prebuilt/ios/libjpeg.a similarity index 100% rename from thirdparty/jpeg/prebuilt/ios/libjpeg.a rename to thirdparty/jpeg-turbo/prebuilt/ios/libjpeg.a diff --git a/thirdparty/jpeg/prebuilt/linux/x64/libjpeg.a b/thirdparty/jpeg-turbo/prebuilt/linux/x64/libjpeg.a similarity index 100% rename from thirdparty/jpeg/prebuilt/linux/x64/libjpeg.a rename to thirdparty/jpeg-turbo/prebuilt/linux/x64/libjpeg.a diff --git a/thirdparty/jpeg/prebuilt/mac/libjpeg.a b/thirdparty/jpeg-turbo/prebuilt/mac/libjpeg.a similarity index 100% rename from thirdparty/jpeg/prebuilt/mac/libjpeg.a rename to thirdparty/jpeg-turbo/prebuilt/mac/libjpeg.a diff --git a/thirdparty/jpeg/prebuilt/windows/x64/jpeg-static.lib b/thirdparty/jpeg-turbo/prebuilt/windows/x64/jpeg-static.lib similarity index 100% rename from thirdparty/jpeg/prebuilt/windows/x64/jpeg-static.lib rename to thirdparty/jpeg-turbo/prebuilt/windows/x64/jpeg-static.lib diff --git a/thirdparty/jpeg/prebuilt/windows/x86/jpeg-static.lib b/thirdparty/jpeg-turbo/prebuilt/windows/x86/jpeg-static.lib similarity index 100% rename from thirdparty/jpeg/prebuilt/windows/x86/jpeg-static.lib rename to thirdparty/jpeg-turbo/prebuilt/windows/x86/jpeg-static.lib