Further cleaning.

This commit is contained in:
jmsgrogan 2023-01-13 15:03:07 +00:00
parent cb4212d972
commit 4fbe6279d1
12 changed files with 141 additions and 89 deletions

View file

@ -1,9 +1,9 @@
set(MODULE_NAME fonts)
message(STATUS "Checking dependencies for module: " ${MODULE_NAME})
set(fonts_LIB_DEPENDS "")
set(LIB_DEPENDS "")
list(APPEND fonts_LIB_INCLUDES
list(APPEND LIB_INCLUDES
FontReader.cpp
TrueTypeFont.cpp
FontsManager.cpp
@ -16,16 +16,18 @@ list(APPEND fonts_LIB_INCLUDES
IFontEngine.h
BasicFontEngine.h
BasicFontEngine.cpp
FontItem.h
FontItem.cpp
)
if(UNIX)
find_package(Freetype QUIET)
if(Freetype_FOUND)
list(APPEND fonts_LIB_INCLUDES
list(APPEND LIB_INCLUDES
FreeTypeFontEngine.cpp
)
list(APPEND fonts_LIB_DEPENDS
list(APPEND LIB_DEPENDS
Freetype::Freetype
)
list(APPEND DEFINES "HAS_FREETYPE")
@ -33,25 +35,25 @@ if(UNIX)
message(STATUS "Freetype not found - skipping support")
endif()
else()
list(APPEND fonts_LIB_INCLUDES
list(APPEND LIB_INCLUDES
directx/DirectWriteFontEngine.h
directx/DirectWriteHelpers.h
directx/DirectWriteFontEngine.cpp
directx/DirectWriteHelpers.cpp
)
list(APPEND fonts_LIB_DEPENDS
list(APPEND LIB_DEPENDS
Dwrite.lib D2d1.lib uuid.lib
)
endif()
add_library(${MODULE_NAME} SHARED ${fonts_LIB_INCLUDES})
add_library(${MODULE_NAME} SHARED ${LIB_INCLUDES})
target_include_directories(${MODULE_NAME} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/directx
)
target_link_libraries(${MODULE_NAME} PUBLIC core geometry image ${fonts_LIB_DEPENDS})
target_link_libraries(${MODULE_NAME} PUBLIC core geometry image ${LIB_DEPENDS})
target_compile_definitions(${MODULE_NAME} PRIVATE ${DEFINES})
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)