diff options
| author | Simon Hausmann <hausmann@gmail.com> | 2018-10-09 14:05:08 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-09 05:05:08 -0700 |
| commit | 33aa4b4c71f152e09937cb29acd76b81aee1c33b (patch) | |
| tree | 254b4c8c6bbf9da6fac630be4038b6bf0f9f2995 | |
| parent | 77fbb32e9e526f40f0d425d5faa0ffaa04aedda9 (diff) | |
| download | vcpkg-33aa4b4c71f152e09937cb29acd76b81aee1c33b.tar.gz vcpkg-33aa4b4c71f152e09937cb29acd76b81aee1c33b.zip | |
Fix harfbuzz targets (#4345)
Since commit 6a97d0f3d377a35ea691d15ac142ce043f953e71 upstream, the
target is in the harfbuzz:: namespace.
| -rw-r--r-- | ports/harfbuzz/0001-fix-cmake-export.patch | 6 | ||||
| -rw-r--r-- | ports/harfbuzz/CONTROL | 2 | ||||
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ports/harfbuzz/0001-fix-cmake-export.patch b/ports/harfbuzz/0001-fix-cmake-export.patch index 0efecec2d..a5abffa41 100644 --- a/ports/harfbuzz/0001-fix-cmake-export.patch +++ b/ports/harfbuzz/0001-fix-cmake-export.patch @@ -13,9 +13,9 @@ index e881dbd1..69496561 100644 FRAMEWORK DESTINATION Library/Frameworks ) + install(EXPORT harfbuzzConfig -+ NAMESPACE unofficial::harfbuzz:: -+ FILE unofficial-harfbuzz-config.cmake -+ DESTINATION share/unofficial-harfbuzz ++ NAMESPACE harfbuzz:: ++ FILE harfbuzz-config.cmake ++ DESTINATION share/harfbuzz + ) if (HB_BUILD_UTILS) install(TARGETS hb-view diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index da621b58d..f3c58ee6e 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,5 +1,5 @@ Source: harfbuzz -Version: 1.8.4-1 +Version: 1.8.4-2 Description: HarfBuzz OpenType text shaping engine Build-Depends: freetype, ragel Default-Features: ucdn diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 0a92439dc..382b045e1 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -56,11 +56,11 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-harfbuzz TARGET_PATH share/unofficial-harfbuzz) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/harfbuzz TARGET_PATH share/harfbuzz) vcpkg_copy_pdbs() # Handle copyright file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz) file(RENAME ${CURRENT_PACKAGES_DIR}/share/harfbuzz/COPYING ${CURRENT_PACKAGES_DIR}/share/harfbuzz/copyright) -vcpkg_test_cmake(PACKAGE_NAME unofficial-harfbuzz) +vcpkg_test_cmake(PACKAGE_NAME harfbuzz) |