mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 11:13:02 +08:00
[libpng] Search libm in implicit link dirs (#35924)
This commit is contained in:
parent
70fd6a9409
commit
5a48f2eb0f
17
ports/libpng/libm.patch
Normal file
17
ports/libpng/libm.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 958b1d6..21c8941 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -84,6 +84,12 @@ endif()
|
||||
|
||||
if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU AND NOT EMSCRIPTEN)
|
||||
find_library(M_LIBRARY m)
|
||||
+ if(NOT M_LIBRARY)
|
||||
+ find_library(M_LIBRARY m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH)
|
||||
+ if(M_LIBRARY)
|
||||
+ set(M_LIBRARY m)
|
||||
+ endif()
|
||||
+ endif()
|
||||
if(NOT M_LIBRARY)
|
||||
set(M_LIBRARY "")
|
||||
endif()
|
@ -38,6 +38,7 @@ vcpkg_from_github(
|
||||
"${LIBPNG_APNG_PATCH_PATH}"
|
||||
cmake.patch
|
||||
fix-export-targets.patch
|
||||
libm.patch
|
||||
pkgconfig.patch
|
||||
fix-msa-support-for-mips.patch
|
||||
)
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "libpng",
|
||||
"version": "1.6.40",
|
||||
"port-version": 1,
|
||||
"description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files",
|
||||
"homepage": "https://github.com/glennrp/libpng",
|
||||
"license": "libpng-2.0",
|
||||
|
@ -4682,7 +4682,7 @@
|
||||
},
|
||||
"libpng": {
|
||||
"baseline": "1.6.40",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"libpopt": {
|
||||
"baseline": "1.16",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8b6d2c1150541a94c0ca5b2f060eb21eed4a40b2",
|
||||
"version": "1.6.40",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "1a2a7f489e57c9e55e049b7c5f0a28c8ff4464ed",
|
||||
"version": "1.6.40",
|
||||
|
Loading…
Reference in New Issue
Block a user