diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-01-27 19:06:50 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-01-27 19:06:50 -0800 |
| commit | 6a58bee5e4e1277aea4c6f0f3991645abb738bbf (patch) | |
| tree | 98a02ec458c232805ff051ca7330d9cfa3749f5f | |
| parent | d2ef8f847e56f97ab988c3314c3b064497571955 (diff) | |
| download | vcpkg-6a58bee5e4e1277aea4c6f0f3991645abb738bbf.tar.gz vcpkg-6a58bee5e4e1277aea4c6f0f3991645abb738bbf.zip | |
[harfbuzz] Uses in-source builds, so we need to clean them every time.
| -rw-r--r-- | ports/harfbuzz/CONTROL | 2 | ||||
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 526dca3b3..6a54dc583 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,4 +1,4 @@ Source: harfbuzz -Version: 1.3.4-1 +Version: 1.3.4-2 Description: HarfBuzz OpenType text shaping engine Build-Depends: freetype, glib diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 83f267912..ac3252455 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -11,7 +11,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/harfbuzz-1.3.4) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/harfbuzz-1.3.4) find_program(NMAKE nmake) vcpkg_download_distfile(ARCHIVE @@ -19,7 +19,9 @@ vcpkg_download_distfile(ARCHIVE FILENAME "harfbuzz-1.3.4.tar.bz2" SHA512 72027ce64d735f1f7ecabcc78ba426d6155cebd564439feb77cefdfc28b00bfd9f6314e6735addaa90cee1d98cf6d2c0b61f77b446ba34e11f7eb7cdfdcd386a ) -vcpkg_extract_source_archive(${ARCHIVE}) +# Harfbuzz only supports in-source builds, so to make sure we get a clean build, we need to re-extract every time +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src) +vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src) file(WRITE ${SOURCE_PATH}/win32/msvc_recommended_pragmas.h "/* I'm expected to exist */") |