mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 02:27:49 +08:00
7cd3196145
* Fix unused CMake variable warning * Acquire msys only on Windows * Revise APNG variable names and usage * Fix download mode usability with APNG * Uncompress APNG patch with gzip gzip is a default package of MSYS2 and (most) other systems. 7z download is implemented for windows only. * Revise main CMake patches cmake.patch deals with libpng build configuration. fix-export-targets deals with cmake config export. * Revise pkgconfig patching and fixup * Additional cleanup * Add usage based on FindPNG.cmake * Update versions Co-authored-by: Leonid Pospelov <pospelovlm@yandex.ru>
18 lines
734 B
Diff
18 lines
734 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 3931f12..b570fa8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -909,6 +909,12 @@ endif()
|
|
# Create an export file that CMake users can include() to import our targets.
|
|
if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL)
|
|
install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)
|
|
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" "
|
|
+include(CMakeFindDependencyMacro)
|
|
+find_dependency(ZLIB)
|
|
+include(\"\${CMAKE_CURRENT_LIST_DIR}/lib${PNG_LIB_NAME}.cmake\")
|
|
+")
|
|
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng")
|
|
endif()
|
|
|
|
# what's with libpng-manual.txt and all the extra files?
|