Merge "*.pc.in: rename lib_prefix to webp_libname_prefix" into main

This commit is contained in:
James Zern 2022-10-26 19:57:24 +00:00 committed by Gerrit Code Review
commit 8bab09a4a8
7 changed files with 11 additions and 11 deletions

View File

@ -135,10 +135,10 @@ set(INSTALLED_LIBRARIES)
if(MSVC)
# match the naming convention used by nmake
set(lib_prefix "lib")
set(CMAKE_SHARED_LIBRARY_PREFIX "${lib_prefix}")
set(CMAKE_IMPORT_LIBRARY_PREFIX "${lib_prefix}")
set(CMAKE_STATIC_LIBRARY_PREFIX "${lib_prefix}")
set(webp_libname_prefix "lib")
set(CMAKE_SHARED_LIBRARY_PREFIX "${webp_libname_prefix}")
set(CMAKE_IMPORT_LIBRARY_PREFIX "${webp_libname_prefix}")
set(CMAKE_STATIC_LIBRARY_PREFIX "${webp_libname_prefix}")
endif()
set(CMAKE_C_VISIBILITY_PRESET hidden)

View File

@ -749,8 +749,8 @@ fi
dnl =========================
dnl Add an empty lib_prefix variable for use in *.pc.in.
AC_SUBST([lib_prefix])
dnl Add an empty webp_libname_prefix variable for use in *.pc.in.
AC_SUBST([webp_libname_prefix])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([src/webp/config.h])
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile \

View File

@ -7,5 +7,5 @@ Name: libsharpyuv
Description: Library for sharp RGB to YUV conversion
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@sharpyuv
Libs: -L${libdir} -l@webp_libname_prefix@sharpyuv
Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

View File

@ -8,4 +8,4 @@ Description: Library for parsing the WebP graphics format container
Version: @PACKAGE_VERSION@
Requires: libwebp >= 0.2.0
Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@webpdemux
Libs: -L${libdir} -l@webp_libname_prefix@webpdemux

View File

@ -8,5 +8,5 @@ Description: Library for the WebP graphics format
Version: @PACKAGE_VERSION@
Requires: libsharpyuv
Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@webp
Libs: -L${libdir} -l@webp_libname_prefix@webp
Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

View File

@ -7,5 +7,5 @@ Name: libwebpdecoder
Description: Library for the WebP graphics format (decode only)
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@webpdecoder
Libs: -L${libdir} -l@webp_libname_prefix@webpdecoder
Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

View File

@ -8,5 +8,5 @@ Description: Library for manipulating the WebP graphics format container
Version: @PACKAGE_VERSION@
Requires: libwebp >= 0.2.0
Cflags: -I${includedir}
Libs: -L${libdir} -l@lib_prefix@webpmux
Libs: -L${libdir} -l@webp_libname_prefix@webpmux
Libs.private: -lm