From c0dbeae1c45dcd2c3b5e3b613fcb809a45ae7a6c Mon Sep 17 00:00:00 2001 From: Anthony Fok Date: Fri, 15 Jan 2021 15:55:46 +0000 Subject: [PATCH] Add extra CMake install rules Origin: vendor Forwarded: not-needed Last-Update: 2020-11-18 for contrib/cidmap, contrib/fonttools and pycontrib to restore the files that were installed to fontforge-extras and python3-fontforge prior to the FontForge 2020 March Release. Last-Update: 2020-11-18 Gbp-Pq: Name 0001-add-extra-cmake-install-rules.patch --- contrib/cidmap/CMakeLists.txt | 5 +++++ contrib/fonttools/CMakeLists.txt | 9 +++++++++ pycontrib/CMakeLists.txt | 1 + 3 files changed, 15 insertions(+) diff --git a/contrib/cidmap/CMakeLists.txt b/contrib/cidmap/CMakeLists.txt index 70d0f02..7f0517b 100644 --- a/contrib/cidmap/CMakeLists.txt +++ b/contrib/cidmap/CMakeLists.txt @@ -11,3 +11,8 @@ target_link_libraries(mapgb1 PRIVATE fontforge) target_link_libraries(mapjapan1 PRIVATE fontforge) target_link_libraries(mapjapan2 PRIVATE fontforge) target_link_libraries(mapkorean PRIVATE fontforge) + +install(FILES Adobe-CNS1-6.cidmap Adobe-GB1-5.cidmap Adobe-Identity-0.cidmap + Adobe-Japan1-5.cidmap Adobe-Japan1-6.cidmap Adobe-Japan1-7.cidmap + Adobe-Japan2-0.cidmap Adobe-Korea1-2.cidmap + DESTINATION ${CMAKE_INSTALL_DATADIR}/fontforge) diff --git a/contrib/fonttools/CMakeLists.txt b/contrib/fonttools/CMakeLists.txt index 0d3f464..777b79b 100644 --- a/contrib/fonttools/CMakeLists.txt +++ b/contrib/fonttools/CMakeLists.txt @@ -18,3 +18,12 @@ target_link_libraries(dewoff PRIVATE ZLIB::ZLIB) target_link_libraries(pcl2ttf PRIVATE MathLib::MathLib) target_link_libraries(ttf2eps PRIVATE fontforge) target_link_libraries(woff PRIVATE ZLIB::ZLIB) + +install(TARGETS + acorn2sfd dewoff findtable pcl2ttf pfadecrypt + rmligamarks showttf stripttc ttf2eps woff + RUNTIME + DESTINATION ${CMAKE_INSTALL_BINDIR}) + +install(FILES acorn2sfd.1 showttf.1 ttf2eps.1 + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/pycontrib/CMakeLists.txt b/pycontrib/CMakeLists.txt index b121a0d..2814b02 100644 --- a/pycontrib/CMakeLists.txt +++ b/pycontrib/CMakeLists.txt @@ -1,3 +1,4 @@ # Distributed under the original FontForge BSD 3-clause license install(FILES excepthook.py DESTINATION ${CMAKE_INSTALL_DATADIR}/fontforge/python) +install(DIRECTORY simple DESTINATION ${CMAKE_INSTALL_DATADIR}/fontforge/python) -- 2.30.2