diff options
| author | LRFLEW <LRFLEW@aol.com> | 2018-11-08 00:57:08 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-11-07 23:57:08 -0800 |
| commit | 848233b137fc93edd04c45a039d03de8b5abc1b4 (patch) | |
| tree | 07966400ce4705e51f0f62df06c237738e325197 /ports/libpng | |
| parent | 550c9422add13436f4ccf9c094d423874db69c21 (diff) | |
| download | vcpkg-848233b137fc93edd04c45a039d03de8b5abc1b4.tar.gz vcpkg-848233b137fc93edd04c45a039d03de8b5abc1b4.zip | |
Update libpng cmake wrapper for dynamic libraries (#4590)
* Update libpng cmake wrapper for dynamic libraries
* [libpng] Bump control version
* [libgd] Fix parallel source directory writes
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})
|