Skip to content

Commit 0764807

Browse files
committed
[builtins] fix freetype variable case
[cmake] fix win32 failures
1 parent 333cb38 commit 0764807

2 files changed

Lines changed: 17 additions & 12 deletions

File tree

builtins/freetype/CMakeLists.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
# **PLEASE UPDATE ALSO THE FOLLOWING LINE WHEN UPDATING THE VERSION**
88
# 22 Mar 2026, https://github.com/freetype/freetype/releases/tag/VER-2-14-3
9-
set(FREETYPE_VERSION 2.14.3)
10-
set(FREETYPE_HASH "e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1")
9+
set(ROOT_FREETYPE_VERSION 2.14.3)
10+
set(ROOT_FREETYPE_HASH "e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1")
1111

1212
set(FREETYPE_PREFIX ${CMAKE_BINARY_DIR}/builtins/FREETYPE-prefix)
1313

@@ -34,8 +34,8 @@ set(FREETYPE_LIBRARY ${FREETYPE_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}freety
3434

3535
ExternalProject_Add(
3636
BUILTIN_FREETYPE
37-
URL ${lcgpackages}/freetype-${FREETYPE_VERSION}.tar.gz
38-
URL_HASH SHA256=${FREETYPE_HASH}
37+
URL ${lcgpackages}/freetype-${ROOT_FREETYPE_VERSION}.tar.gz
38+
URL_HASH SHA256=${ROOT_FREETYPE_HASH}
3939
PREFIX ${FREETYPE_PREFIX}
4040
CMAKE_ARGS -G ${CMAKE_GENERATOR}
4141
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
@@ -76,7 +76,11 @@ endif()
7676

7777
# Set the canonical output of find_package according to
7878
# https://cmake.org/cmake/help/latest/manual/cmake-developer.7.html#standard-variable-names
79-
set(FREETYPE_INCLUDE_DIRS ${incdir} PARENT_SCOPE)
80-
set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY} PARENT_SCOPE)
81-
set(Freetype_FOUND TRUE PARENT_SCOPE)
82-
set(Freetype_VERSION ${FREETYPE_VERSION} PARENT_SCOPE)
79+
# FindFreetype seems quite hacky (non-standard) https://github.com/Kitware/CMake/blob/0ea36ddcf68fc52c0a0cb6035b612817551ca8d7/Modules/FindFreetype.cmake#L120
80+
set(FREETYPE_INCLUDE_DIRS ${incdir} PARENT_SCOPE) # FindFreetype.cmake seems to define capital (non-standard)
81+
set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY} PARENT_SCOPE) # FindFreetype.cmake seems to define capital (non-standard)
82+
set(FREETYPE_LIBRARY ${FREETYPE_LIBRARY} PARENT_SCOPE) # FindFreetype.cmake seems to read this as HINT (non-standard)
83+
set(Freetype_FOUND TRUE PARENT_SCOPE) # FindFreetype.cmake added with standard case in CMake 3.3
84+
set(FREETYPE_FOUND TRUE PARENT_SCOPE) # FindFreetype.cmake historical (non-standard, deprecated with 4.2)
85+
set(Freetype_VERSION ${ROOT_FREETYPE_VERSION} PARENT_SCOPE) # FindFreetype.cmake added with standard case in CMake 4.2
86+
set(FREETYPE_VERSION_STRING ${ROOT_FREETYPE_VERSION} PARENT_SCOPE) # FindFreetype.cmake historical (non-standard, deprecated with 4.2)

graf2d/asimage/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImage
2626
-writeEmptyRootPCM
2727
LIBRARIES
2828
libAfterImage
29-
${ASEXTRA_LIBRARIES}
30-
${FREETYPE_LIBRARIES}
31-
${X11_LIBRARIES}
29+
JPEG::JPEG
30+
PNG::PNG
31+
GIF::GIF
32+
libAfterImage
33+
Freetype::Freetype
3234
ZLIB::ZLIB
3335
DEPENDENCIES
3436
Core
3537
Graf
3638
Postscript
3739
)
3840

39-
target_link_libraries(ASImage PRIVATE JPEG::JPEG PNG::PNG GIF::GIF libAfterImage Freetype::Freetype)
4041
if (x11)
4142
target_link_libraries(ASImage PRIVATE X11::X11)
4243
endif()

0 commit comments

Comments
 (0)