[libspng] Install pkg-config on Windows #53510
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index da1917e..d385e46 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -17,10 +17,13 @@ option(BUILD_EXAMPLES "Build examples" ON) | ||
| include(GNUInstallDirs) | ||
| include(CMakePackageConfigHelpers) | ||
|
|
||
| -if(NOT CMAKE_HOST_WIN32) | ||
| +find_library(MATH_LIBRARY_PATH NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) | ||
| +if(MATH_LIBRARY_PATH) | ||
| set(MATH_LIBRARY "m") | ||
| + set(LIBS "-lm") | ||
| else() | ||
| set(MATH_LIBRARY "") | ||
| + set(LIBS "") | ||
| endif() | ||
|
|
||
| if(NOT ENABLE_OPT) | ||
| @@ -93,16 +96,13 @@ install( | ||
| DESTINATION ${config_install_dir} | ||
| ) | ||
|
|
||
| -if(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW) | ||
| - set(prefix ${CMAKE_INSTALL_PREFIX}) | ||
| - set(exec_prefix ${CMAKE_INSTALL_PREFIX}) | ||
| - set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) | ||
| - set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) | ||
| - set(LIBS "-lm") | ||
| +set(prefix ${CMAKE_INSTALL_PREFIX}) | ||
| +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) | ||
| +set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) | ||
| +set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) | ||
|
|
||
| - foreach(libname ${spng_TARGETS}) | ||
| - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/libspng.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/lib${libname}.pc @ONLY) | ||
| +foreach(libname ${spng_TARGETS}) | ||
| + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/spng.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/${libname}.pc @ONLY) | ||
|
|
||
| - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/lib${libname}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | ||
| - endforeach() | ||
| -endif() | ||
| + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/${libname}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | ||
| +endforeach() | ||
| diff --git a/cmake/libspng.pc.in b/cmake/spng.pc.in | ||
| similarity index 92% | ||
| rename from cmake/libspng.pc.in | ||
| rename to cmake/spng.pc.in | ||
| index 71e0e47..1904c09 100644 | ||
| --- a/cmake/libspng.pc.in | ||
| +++ b/cmake/spng.pc.in | ||
| @@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ | ||
| libdir=@libdir@ | ||
| includedir=@includedir@/ | ||
|
|
||
| -Name: lib@libname@ | ||
| +Name: @libname@ | ||
| Description: PNG decoding and encoding library | ||
| Version: @SPNG_VERSION@ | ||
| Requires: zlib | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| libspng provides CMake targets: | ||
|
|
||
| find_package(SPNG CONFIG REQUIRED) | ||
| target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:spng::spng>,spng::spng,spng::spng_static>) | ||
|
|
||
| libspng provides pkg-config modules: | ||
|
|
||
| # PNG decoding and encoding library | ||
| spng |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5746,7 +5746,7 @@ | |
| }, | ||
| "libspng": { | ||
| "baseline": "0.7.4", | ||
| "port-version": 1 | ||
| }, | ||
| "libsquish": { | ||
| "baseline": "1.15", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Which names did this install, and which names does it install now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kai Pastor (@dg0yt)
libspnghas two build systems. A meson one and a CMake one. The meson one installsspng.pc, which is also the name used in the Debian package and expected bylibjpeg-turbo. This CMake one installslibspng.pcorlibspng_static.pc. This PR resolves the conflict in favor of their meson build system on the grounds that that is what I see downstream customers expecting.