Merge "*.pc.in: add lib prefix to lib names w/MSVC" into main

This commit is contained in:
James Zern 2022-10-20 18:25:42 +00:00 committed by Gerrit Code Review
commit dfc843aa63
6 changed files with 10 additions and 8 deletions

View File

@ -124,6 +124,7 @@ if(MSVC AND BUILD_SHARED_LIBS)
add_definitions(-DWEBP_DLL)
endif()
# pkg-config variables used by *.pc.in.
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\$\{prefix\}")
set(libdir "\$\{prefix\}/lib")
@ -133,9 +134,10 @@ set(INSTALLED_LIBRARIES)
if(MSVC)
# match the naming convention used by nmake
set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
set(CMAKE_IMPORT_LIBRARY_PREFIX "lib")
set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
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}")
endif()
set(CMAKE_C_VISIBILITY_PRESET hidden)

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} -lsharpyuv
Libs: -L${libdir} -l@lib_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} -lwebpdemux
Libs: -L${libdir} -l@lib_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} -lwebp
Libs: -L${libdir} -l@lib_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} -lwebpdecoder
Libs: -L${libdir} -l@lib_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} -lwebpmux
Libs: -L${libdir} -l@lib_prefix@webpmux
Libs.private: -lm