diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-19 16:49:44 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-19 16:49:44 -0700 |
| commit | fe62b410858c0740fa82bb180b3703b4cd21deac (patch) | |
| tree | fe230aaa6f51116a28ff735d91d1aaf36ec4a936 | |
| parent | f65d6e3dc77fdeb8299bdb47794859061e3449f8 (diff) | |
| download | vcpkg-fe62b410858c0740fa82bb180b3703b4cd21deac.tar.gz vcpkg-fe62b410858c0740fa82bb180b3703b4cd21deac.zip | |
Improve libpng portfile
| -rw-r--r-- | ports/libpng/portfile.cmake | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index a5e506585..c5aa301bb 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -1,24 +1,19 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24) + vcpkg_download_distfile(ARCHIVE URL "http://download.sourceforge.net/libpng/libpng-1.6.24.tar.xz" FILENAME "libpng-1.6.24.tar.xz" MD5 ffcdbd549814787fa8010c372e35ff25 ) vcpkg_extract_source_archive(${ARCHIVE}) - -find_program(GIT git) -vcpkg_execute_required_process( - COMMAND ${GIT} init - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24 - LOGNAME git-init -) -execute_process( - COMMAND ${GIT} apply "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch" --ignore-whitespace --whitespace=nowarn - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24 +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch" ) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DPNG_STATIC=OFF -DPNG_TESTS=OFF @@ -41,7 +36,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpng/libpng16-debug.cmake ${CURR file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/libpng ) -file(COPY ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpng) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpng) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libpng/LICENSE ${CURRENT_PACKAGES_DIR}/share/libpng/copyright) vcpkg_copy_pdbs() |