dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-19 20:08:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

*.pc.in: add lib prefix to lib names w/MSVC

Browse Source 
this fixes the library names output after:
9ac25bcb3 CMakeLists.txt,win32: match naming convention used by nmake

before this change:
pkg-config --libs --msvc-syntax \
  libwebp libwebpdemux libwebpmux libsharpyuv libwebpdecoder
/libpath:.../lib webpdemux.lib webpmux.lib webp.lib
  sharpyuv.lib webpdecoder.lib

after:
pkg-config --libs --msvc-syntax \
  libwebp libwebpdemux libwebpmux libsharpyuv libwebpdecoder
/libpath:.../lib libwebpdemux.lib libwebpmux.lib libwebp.lib
  libsharpyuv.lib libwebpdecoder.lib

Bug: webp:584
Change-Id: Ic3693b58a40e0ba683333065003b1c00aab0cf48
Fixed: webp:584
This commit is contained in:
James Zern 2022-10-15 15:54:17 -07:00
parent d34f9b99b9
commit 2498209ba9
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

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

2
sharpyuv/libsharpyuv.pc.in
View File

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

2
src/demux/libwebpdemux.pc.in
View File

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

2
src/libwebp.pc.in
View File

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

2
src/libwebpdecoder.pc.in
View File

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

2
src/mux/libwebpmux.pc.in
View File

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