diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2017-05-05 14:45:16 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2017-05-05 14:45:16 +0000 |
| commit | 89ecd445f13b21093aef1ac00c1ecbc1b9f33697 (patch) | |
| tree | 561f8b478eded4d89477290ff6b8a4f4015c4807 /CMakeScripts | |
| parent | Remove couts (diff) | |
| parent | Improve responsive from LPE (diff) | |
| download | inkscape-89ecd445f13b21093aef1ac00c1ecbc1b9f33697.tar.gz inkscape-89ecd445f13b21093aef1ac00c1ecbc1b9f33697.zip | |
Update to trunk
(bzr r15620.1.17)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index c6690bbe9..c8c580fe4 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -166,7 +166,20 @@ if(WIN32) install(DIRECTORY ${MINGW_PATH}/share/glib-2.0/schemas
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/glib-2.0)
+ # fontconfig
install(DIRECTORY ${MINGW_PATH}/etc/fonts
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/etc
+ FILES_MATCHING PATTERN "fonts.conf" EXCLUDE)
+ # adjust fonts.conf to store font cache in AppData
+ set(cachedir_default "\\t^<cachedir^>/var/cache/fontconfig^</cachedir^>") # the '^' are needed to escape angle brackets on Windows command shell
+ set(cachedir_appdata "\\t^<cachedir^>LOCAL_APPDATA_FONTCONFIG_CACHE^</cachedir^>")
+ add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/etc/fonts/fonts.conf
+ COMMAND sed 's!${cachedir_default}!${cachedir_appdata}\\n${cachedir_default}!' ${MINGW_PATH}/etc/fonts/fonts.conf > ${CMAKE_BINARY_DIR}/etc/fonts/fonts.conf
+ MAIN_DEPENDENCY ${MINGW_PATH}/etc/fonts/fonts.conf
+ )
+ add_custom_target(fonts_conf ALL DEPENDS ${CMAKE_BINARY_DIR}/etc/fonts/fonts.conf)
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/fonts
DESTINATION ${CMAKE_INSTALL_PREFIX}/etc)
# GTK 3.0
@@ -221,7 +234,9 @@ if(WIN32) DESTINATION ${CMAKE_INSTALL_PREFIX})
install(DIRECTORY ${MINGW_LIB}/python2.7
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
- PATTERN "python2.7/site-packages" EXCLUDE)
+ PATTERN "python2.7/site-packages" EXCLUDE # specify individual packages to install below
+ PATTERN "python2.7/test" EXCLUDE # we don't need the Python testsuite
+ )
set(site_packages "lib/python2.7/site-packages")
# Python packages installed via pacman
|