diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2019-11-20 12:12:04 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-11-20 12:12:04 -0800 |
| commit | 53183733000b3c4b025960ee04db939256556da0 (patch) | |
| tree | bc7c9f21ab64b165580502727f51842c4e91d5c2 | |
| parent | 0887012a3f399079b9ca8fc1378ec7b3cd005e4e (diff) | |
| download | vcpkg-53183733000b3c4b025960ee04db939256556da0.tar.gz vcpkg-53183733000b3c4b025960ee04db939256556da0.zip | |
[freetype-gl] Fix POST_BUILD_CHECKS_FAILED failure on Unix (#8992)
* [freetype-gl] Fix POST_BUILD_CHECKS_FAILED failure on Unix
* Update
| -rw-r--r-- | ports/freetype-gl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freetype-gl/portfile.cmake | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/ports/freetype-gl/CONTROL b/ports/freetype-gl/CONTROL index fd8d7c7ee..5419d6596 100644 --- a/ports/freetype-gl/CONTROL +++ b/ports/freetype-gl/CONTROL @@ -1,5 +1,5 @@ Source: freetype-gl -Version: 2019-03-29-2 +Version: 2019-03-29-3 Homepage: https://github.com/rougier/freetype-gl Description: OpenGL text using one vertex buffer, one texture and FreeType Build-Depends: glew, freetype diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake index 86d7f678a..5d931ced5 100644 --- a/ports/freetype-gl/portfile.cmake +++ b/ports/freetype-gl/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -39,15 +37,16 @@ file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/freetyp # LIB file(GLOB LIBS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.lib" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.lib" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" ) file(GLOB DEBUG_LIBS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.lib" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.lib" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" ) + file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) |