diff options
| author | eao197 <eao197@gmail.com> | 2018-11-12 16:19:10 +0300 |
|---|---|---|
| committer | eao197 <eao197@gmail.com> | 2018-11-12 16:19:10 +0300 |
| commit | 2d0ce681b068da0b05c3a4a99573dd00a9415eba (patch) | |
| tree | 85f9572b8edaa611199d6e281af278e56d0094bf /ports/libpng | |
| parent | 8c13a782a044edc67f655b5dcb0227e737136e74 (diff) | |
| parent | 8dc8d0e0c97550a95b764287adbad90b7df7d11d (diff) | |
| download | vcpkg-2d0ce681b068da0b05c3a4a99573dd00a9415eba.tar.gz vcpkg-2d0ce681b068da0b05c3a4a99573dd00a9415eba.zip | |
Merge https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports/libpng')
| -rw-r--r-- | ports/libpng/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpng/vcpkg-cmake-wrapper.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index d7e4b8e89..e16f6b1c8 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,4 +1,4 @@ Source: libpng -Version: 1.6.35 +Version: 1.6.35-1 Build-Depends: zlib Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff --git a/ports/libpng/vcpkg-cmake-wrapper.cmake b/ports/libpng/vcpkg-cmake-wrapper.cmake index 88813d68c..cb9c74f32 100644 --- a/ports/libpng/vcpkg-cmake-wrapper.cmake +++ b/ports/libpng/vcpkg-cmake-wrapper.cmake @@ -1,4 +1,6 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16.a")
set(PNG_LIBRARY_RELEASE "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16.a" CACHE FILEPATH "")
+elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ set(PNG_LIBRARY_RELEASE "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE FILEPATH "")
endif()
_find_package(${ARGS})
|