diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-02-15 14:32:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-15 14:32:07 -0800 |
| commit | 7a18088cf2c513863761200b0d01f20be8bfa2c2 (patch) | |
| tree | 1763adfb565686dead95106305080b40767ad83e | |
| parent | 6e687c3a921ba91b6e5533a653e4faf97bc978b6 (diff) | |
| download | vcpkg-7a18088cf2c513863761200b0d01f20be8bfa2c2.tar.gz vcpkg-7a18088cf2c513863761200b0d01f20be8bfa2c2.zip | |
[vcpkg create, docs] Update create command's template and documentation on patching (#5370)
| -rw-r--r-- | docs/examples/patching.md | 10 | ||||
| -rw-r--r-- | scripts/templates/portfile.in.cmake | 15 |
2 files changed, 18 insertions, 7 deletions
diff --git a/docs/examples/patching.md b/docs/examples/patching.md index 98115400e..b152231e2 100644 --- a/docs/examples/patching.md +++ b/docs/examples/patching.md @@ -147,11 +147,11 @@ Finally, we need to apply the patch after extracting the source. ```cmake # ports\libpng\portfile.cmake ... -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24 - PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch" +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + "use-abort-on-all-platforms.patch" ) vcpkg_configure_cmake( diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index e44f53aa8..33f8a4853 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -11,13 +11,24 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/@ROOT_NAME@) + vcpkg_download_distfile(ARCHIVE URLS "@URL@" FILENAME "@FILENAME@" SHA512 @SHA512@ ) -vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag). + # REF 1.0.0 + # (Optional) Read the docs for how to generate patches at: + # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md + # PATCHES + # 001_port_fixes.patch + # 002_more_port_fixes.patch +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} |