diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-05 11:39:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 11:39:17 -0700 |
| commit | f7de1342d1c27b7b8e0b1ce807f6013feeeea592 (patch) | |
| tree | da72f7a1189dc3cc85eeb93fea3189730fb3b702 | |
| parent | d9e7f7488ce61028f7d644aec09969e041218903 (diff) | |
| parent | d4bdf8508fb203cd13f4cc62ec70e0bedee8473b (diff) | |
| download | vcpkg-f7de1342d1c27b7b8e0b1ce807f6013feeeea592.tar.gz vcpkg-f7de1342d1c27b7b8e0b1ce807f6013feeeea592.zip | |
Merge pull request #899 from jumpinjackie/fix-freetype-include-dir
[freetype] Patch the include directory to the renamed one
| -rw-r--r-- | ports/freetype/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freetype/portfile.cmake | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 866033e3c..3afd18c9d 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,4 +1,4 @@ Source: freetype -Version: 2.6.3-4 +Version: 2.6.3-5 Build-Depends: zlib, bzip2, libpng Description: A library to render fonts.
\ No newline at end of file diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 360345f1c..b5c20a610 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -33,8 +33,18 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(READ ${CURRENT_PACKAGES_DIR}/debug/share/freetype/freetype-config-debug.cmake DEBUG_MODULE) string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}") +string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" DEBUG_MODULE "${DEBUG_MODULE}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config-debug.cmake "${DEBUG_MODULE}") +file(READ ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config-release.cmake RELEASE_MODULE) +string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" RELEASE_MODULE "${RELEASE_MODULE}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config-release.cmake "${RELEASE_MODULE}") + +# Fix the include dir [freetype2 -> freetype] +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/freetype/freetype-config.cmake CONFIG_MODULE) +string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include/freetype" CONFIG_MODULE "${CONFIG_MODULE}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config.cmake "${CONFIG_MODULE}") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY |