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

diff --git a/contrib/cidmap/CMakeLists.txt b/contrib/cidmap/CMakeLists.txt
index 70d0f023ce42102c518377fe6ec985407b858c23..7f0517b87374cff597a9c6c801269093fc10ff33 100644 (file)
--- 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 0d3f464bcf2dd2d0bb3753fadbc585dc61b6ec2e..777b79b79cc5bb6bcf2622bf56ec91e7c66c5910 100644 (file)
--- 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 b121a0d20e15c13acf4ba3e5bb653aa1b4ad266a..2814b02b94eee3e8461630cf280821e15efa3ce7 100644 (file)
--- 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)