diff --git a/cmake/macros/TargetAFF.cmake b/cmake/macros/TargetAFF.cmake new file mode 100644 index 0000000000..1e57eeec2c --- /dev/null +++ b/cmake/macros/TargetAFF.cmake @@ -0,0 +1,7 @@ + +macro(TARGET_AFF) + find_package(artery-font-format) + target_link_libraries(${TARGET_NAME} artery-font-format::artery-font-format) +endmacro() + + diff --git a/conanfile.py b/conanfile.py index 8be69c6248..2089638786 100644 --- a/conanfile.py +++ b/conanfile.py @@ -45,6 +45,7 @@ class Overte(ConanFile): def requirements(self): # self.requires("shaderc/2021.1") # Broken # self.requires("crashpad/cci.20220219") # Broken + self.requires("artery-font-format/1.0.1") self.requires("bullet3/3.25") self.requires("cgltf/1.14@overte/stable") self.requires("discord-rpc/3.4.0@anotherfoxguy/stable") diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt index 9986f17816..8f615293b3 100644 --- a/libraries/render-utils/CMakeLists.txt +++ b/libraries/render-utils/CMakeLists.txt @@ -14,6 +14,9 @@ include_hifi_library_headers(octree) include_hifi_library_headers(script-engine) include_hifi_library_headers(hfm) +# Artery Font Format +target_aff() + # tell CMake to exclude qrc_fonts.cpp for policy CMP0071 set_property(SOURCE qrc_fonts.cpp PROPERTY SKIP_AUTOMOC ON)