Skip to content

Commit

Permalink
Update the freetype library from 2.6.1 to 2.12.1
Browse files Browse the repository at this point in the history
This fixes the graphics with the latest Visual Studio 2022 (17.2)
  • Loading branch information
bellenot committed Jun 8, 2022
1 parent 20e2372 commit c9ea760
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmake/modules/SearchInstalledSoftware.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ if(NOT builtin_freetype)
endif()

if(builtin_freetype)
set(freetype_version 2.6.1)
set(freetype_version 2.12.1)
message(STATUS "Building freetype version ${freetype_version} included in ROOT itself")
set(FREETYPE_LIBRARY ${CMAKE_BINARY_DIR}/FREETYPE-prefix/src/FREETYPE/objs/.libs/${CMAKE_STATIC_LIBRARY_PREFIX}freetype${CMAKE_STATIC_LIBRARY_SUFFIX})
if(WIN32)
Expand All @@ -131,7 +131,7 @@ if(builtin_freetype)
ExternalProject_Add(
FREETYPE
URL ${CMAKE_SOURCE_DIR}/graf2d/freetype/src/freetype-${freetype_version}.tar.gz
URL_HASH SHA256=0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
URL_HASH SHA256=efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938
INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS -G ${CMAKE_GENERATOR} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${freetypebuild}
Expand All @@ -152,7 +152,7 @@ if(builtin_freetype)
ExternalProject_Add(
FREETYPE
URL ${CMAKE_SOURCE_DIR}/graf2d/freetype/src/freetype-${freetype_version}.tar.gz
URL_HASH SHA256=0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
URL_HASH SHA256=efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938
CONFIGURE_COMMAND ./configure --prefix <INSTALL_DIR> --with-pic
--disable-shared --with-png=no --with-bzip2=no
--with-harfbuzz=no ${_freetype_zlib}
Expand Down
Binary file added graf2d/freetype/src/freetype-2.12.1.tar.gz
Binary file not shown.
Binary file removed graf2d/freetype/src/freetype-2.6.1.tar.gz
Binary file not shown.

0 comments on commit c9ea760

Please sign in to comment.