GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix macos build

Browse Source
This commit is contained in:
Georg Hagen
2024-08-15 00:28:20 +02:00
parent 840ff67f01
commit ea11bd4527
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
3rdParty/msdf/CMakeLists.txt vendored
View File

@@ -14,7 +14,9 @@ if (ENABLE_MSDF)
endif()
unset(Freetype_FOUND)
find_package(Freetype QUIET)
if (NOT APPLE)
find_package(Freetype QUIET)
endif ()
if (NOT Freetype_FOUND OR NOT EXISTS "${CMAKE_BINARY_DIR}/_deps/freetype-src/build")
message("Installing freetype from sources")
FetchContent_Declare(
@@ -51,8 +53,8 @@ if (ENABLE_MSDF)
if (NOT ${build_result} EQUAL "0")
message(FATAL_ERROR "Failed to build freetype!")
endif()
set(FREETYPE_INCLUDE_DIR "${FT_SRC_DIR}/freetype-install/include/freetype2" CACHE INTERNAL "ft include dir")
set(FREETYPE_BUILT_FROM_SOURCES ON CACHE BOOL "ft built from sources")
set(FREETYPE_INCLUDE_DIR "${FT_SRC_DIR}/freetype-install/include/freetype2" CACHE INTERNAL "ft include dir" FORCE)
set(FREETYPE_BUILT_FROM_SOURCES ON CACHE BOOL "ft built from sources" FORCE)
list(APPEND CMAKE_PREFIX_PATH "${FT_SRC_DIR}/freetype-install")
endif()
@@ -87,7 +89,7 @@ endif()
function(LinkMsdf TARGET)
if (ENABLE_MSDF)
target_link_libraries(${TARGET} PRIVATE msdfgen::msdfgen msdfgen::msdfgen-ext msdf-atlas-gen)
target_link_libraries(${TARGET} PUBLIC msdfgen::msdfgen msdfgen::msdfgen-ext msdf-atlas-gen)
if (FREETYPE_BUILT_FROM_SOURCES)
target_include_directories(${TARGET} PUBLIC ${FREETYPE_INCLUDE_DIR})
else()