Update libraqm to 0.7.0 (#7149)

This commit is contained in:
Tobias Markus 2019-07-10 08:15:18 +02:00 committed by Phil Christensen
parent e7aafb7742
commit 9b861040d6
3 changed files with 14 additions and 4 deletions

View File

@ -12,7 +12,10 @@ find_path(HARFBUZZ_INCLUDE_DIRS
NAMES hb.h NAMES hb.h
PATH_SUFFIXES harfbuzz) PATH_SUFFIXES harfbuzz)
find_path(FREETYPE_ADDITIONAL_INCLUDE_DIRS NAMES ft2build.h) find_path(FREETYPE_ADDITIONAL_INCLUDE_DIRS NAMES ft2build.h)
add_library(raqm ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.c ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h)
add_library(raqm ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.c ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h)
target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_ADDITIONAL_INCLUDE_DIRS}) target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_ADDITIONAL_INCLUDE_DIRS})
target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_INCLUDE_DIRS}) target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_INCLUDE_DIRS})

View File

@ -1,4 +1,4 @@
Source: libraqm Source: libraqm
Version: 0.6.0 Version: 0.7.0
Description: A library for complex text layout Description: A library for complex text layout
Build-Depends: freetype, harfbuzz, fribidi Build-Depends: freetype, harfbuzz, fribidi

View File

@ -2,11 +2,15 @@ include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
set(RAQM_VERSION_MAJOR 0)
set(RAQM_VERSION_MINOR 7)
set(RAQM_VERSION_MICRO 0)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO HOST-Oman/libraqm REPO HOST-Oman/libraqm
REF v0.6.0 REF v${RAQM_VERSION_MAJOR}.${RAQM_VERSION_MINOR}.${RAQM_VERSION_MICRO}
SHA512 cd223d97b80e9d2cf26a5b68fbb84a87e53df819f12ffd06f84f1786a2207b34828d0888058a40c1d89a1466bb68b75dd326e25415afab029d51e1ed98f6a924 SHA512 fe2f5e5707334d72518e720adff4379666ba5c4c045531e92588c5f843d4f56111e7b66ea4e7a061621320fa98f13229624994a950a789a477674d3a359cb58c
HEAD_REF master HEAD_REF master
) )
@ -18,6 +22,9 @@ vcpkg_configure_cmake(
PREFER_NINJA PREFER_NINJA
OPTIONS OPTIONS
-DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR} -DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}
-DRAQM_VERSION_MAJOR=${RAQM_VERSION_MAJOR}
-DRAQM_VERSION_MINOR=${RAQM_VERSION_MINOR}
-DRAQM_VERSION_MICRO=${RAQM_VERSION_MICRO}
) )
vcpkg_install_cmake() vcpkg_install_cmake()