From 818035caed2f982279fb0837effcdce08122bc59 Mon Sep 17 00:00:00 2001 From: Jaakko Keränen Date: Sun, 31 Oct 2021 09:27:10 +0200 Subject: Cleanup Removed extra font installation from CMakeLists. These are available separately and not managed by CMake. --- CMakeLists.txt | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5f2d65a..4cafc4fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,25 +65,6 @@ include (Depends.cmake) # Package resources. message (STATUS "Preparing resources...") make_fontpack (res/default.fontpack) -# Fonts to install as separate files. -set (FONTPACKS -# arabic.fontpack -# cjk.fontpack -# firasans.fontpack -# literata.fontpack -# nunito.fontpack -# tinos.fontpack -) -foreach (fp ${FONTPACKS}) - make_fontpack (res/${fp}) - set_source_files_properties (${CMAKE_BINARY_DIR}/${fp} - PROPERTIES MACOSX_PACKAGE_LOCATION Resources) -endforeach (fp) -macro (install_fonts dst) - foreach (fp ${FONTPACKS}) - install (FILES ${CMAKE_BINARY_DIR}/${fp} DESTINATION ${dst}) - endforeach (fp) -endmacro () set (EMBED_RESOURCES res/about/about.gmi res/about/help.gmi @@ -240,11 +221,6 @@ set (SOURCES ${CMAKE_CURRENT_BINARY_DIR}/embedded.h ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr ) -if (APPLE) - foreach (fp ${FONTPACKS}) - list (APPEND SOURCES ${CMAKE_BINARY_DIR}/${fp}) - endforeach (fp) -endif () if (ENABLE_IPC) list (APPEND SOURCES src/ipc.c @@ -444,7 +420,6 @@ if (MSYS) if (NOT ENABLE_RESOURCE_EMBED) install (FILES ${EMB_BIN} DESTINATION .) endif () - install_fonts (.) install (PROGRAMS ${SDL2_LIBDIR}/SDL2.dll res/urlopen.bat @@ -460,7 +435,6 @@ elseif (HAIKU) LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr") install (FILES ${EMB_BIN} DESTINATION .) endif () - install_fonts (.) elseif (UNIX AND NOT APPLE) set_target_properties (app PROPERTIES INSTALL_RPATH_USE_LINK_PATH YES @@ -493,5 +467,4 @@ MimeType=x-scheme-handler/gemini;x-scheme-handler/gopher endif () install (FILES ${EMB_BIN} DESTINATION share/lagrange) endif () - install_fonts (share/lagrange) endif () -- cgit v1.2.3