diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-01 21:31:48 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-01 21:31:48 +0000 |
| commit | 035f5ed006ed983fd52e4da0bde49fc6a80534ce (patch) | |
| tree | b3ac5e1d4cde91e4a4089281cf4b4edd7794780e /CMakeScripts | |
| parent | Cleaninng (diff) | |
| parent | Merge powerStrokeSmooth (diff) | |
| download | inkscape-035f5ed006ed983fd52e4da0bde49fc6a80534ce.tar.gz inkscape-035f5ed006ed983fd52e4da0bde49fc6a80534ce.zip | |
Merge branch 'powerpencilII' of https://gitlab.com/inkscape/inkscape into powerpencilII
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index a192f459f..6f66d5e26 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -39,7 +39,6 @@ if(WIN32) ${MINGW_BIN}/libfreetype-[0-9]*.dll
${MINGW_BIN}/libfribidi-[0-9]*.dll
${MINGW_BIN}/libgc-[0-9]*.dll
- ${MINGW_BIN}/libgdbm-[0-9]*.dll
${MINGW_BIN}/libgdk-3-[0-9]*.dll
${MINGW_BIN}/libgdk_pixbuf-2.0-[0-9]*.dll
${MINGW_BIN}/libgdkmm-3.0-[0-9]*.dll
@@ -50,8 +49,6 @@ if(WIN32) ${MINGW_BIN}/libglib-2.0-[0-9]*.dll
${MINGW_BIN}/libglibmm-2.4-[0-9]*.dll
${MINGW_BIN}/libgmodule-2.0-[0-9]*.dll
- ${MINGW_BIN}/libgmp-[0-9]*.dll
- ${MINGW_BIN}/libgnutls-[0-9]*.dll
${MINGW_BIN}/libgobject-2.0-[0-9]*.dll
${MINGW_BIN}/libgomp-[0-9]*.dll
${MINGW_BIN}/libgraphite[0-9]*.dll
@@ -61,7 +58,6 @@ if(WIN32) ${MINGW_BIN}/libgtkmm-3.0-[0-9]*.dll
${MINGW_BIN}/libgtkspell3-3-[0-9]*.dll
${MINGW_BIN}/libharfbuzz-[0-9]*.dll
- ${MINGW_BIN}/libhogweed-[0-9]*.dll
${MINGW_BIN}/libiconv-[0-9]*.dll
${MINGW_BIN}/libicudt[0-9]*.dll
${MINGW_BIN}/libicuin[0-9]*.dll
@@ -71,14 +67,11 @@ if(WIN32) ${MINGW_BIN}/libjpeg-[0-9]*.dll
${MINGW_BIN}/liblcms2-[0-9]*.dll
${MINGW_BIN}/liblqr-1-[0-9]*.dll
- ${MINGW_BIN}/libltdl-[0-9]*.dll
${MINGW_BIN}/liblzma-[0-9]*.dll
- ${MINGW_BIN}/libnettle-[0-9]*.dll
${MINGW_BIN}/libnghttp2-[0-9]*.dll
${MINGW_BIN}/libnspr[0-9]*.dll
${MINGW_BIN}/libopenblas.dll
${MINGW_BIN}/libopenjp2-[0-9]*.dll
- ${MINGW_BIN}/libp11-kit-[0-9]*.dll
${MINGW_BIN}/libpango-1.0-[0-9]*.dll
${MINGW_BIN}/libpangocairo-1.0-[0-9]*.dll
${MINGW_BIN}/libpangoft2-1.0-[0-9]*.dll
@@ -99,13 +92,11 @@ if(WIN32) ${MINGW_BIN}/librevenge-0.[0-9]*.dll
${MINGW_BIN}/librevenge-stream-0.[0-9]*.dll
${MINGW_BIN}/librsvg-2-[0-9]*.dll
- ${MINGW_BIN}/librtmp-[0-9]*.dll
${MINGW_BIN}/libsigc-2.0-[0-9]*.dll
${MINGW_BIN}/libsoup-2.4-[0-9]*.dll
${MINGW_BIN}/libsqlite3-[0-9]*.dll
${MINGW_BIN}/libssh2-[0-9]*.dll
${MINGW_BIN}/libstdc++-[0-9]*.dll
- ${MINGW_BIN}/libtasn1-[0-9]*.dll
${MINGW_BIN}/libtermcap-[0-9]*.dll
${MINGW_BIN}/libtiff-[0-9]*.dll
${MINGW_BIN}/libunistring-[0-9]*.dll
@@ -205,6 +196,13 @@ if(WIN32) ${MINGW_LIB}/enchant/libenchant_aspell.dll
DESTINATION lib/enchant)
+ # tcl/tk related files (required for tkinter)
+ install(DIRECTORY
+ ${MINGW_PATH}/lib/tcl8
+ ${MINGW_PATH}/lib/tcl8.6
+ ${MINGW_PATH}/lib/tk8.6
+ DESTINATION lib)
+
# Necessary to run extensions on windows if it is not in the path
if (HAVE_MINGW64)
install(FILES
|