From 94011e762ba541fb9b9733a9fc00a01442e374cf Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 5 Feb 2017 00:13:08 +0100 Subject: CMake: Remove duplicated check for sigc++ - It didn't make much sense to check twice anyway - The additional check for C++11 is not required anymore after r15039 as we use -std=c++11 by default now - The check broke subsequent cmake runs on Windows (i.e. compilation broke whenever a .cmake file changed and CMakeCache hat to be cleared manually) http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/15039 (bzr r15475) --- CMakeScripts/DefineDependsandFlags.cmake | 3 - CMakeScripts/Modules/FindSigC++.cmake | 128 ------------------------------- CMakeScripts/Modules/sigcpp_test.cpp | 15 ---- 3 files changed, 146 deletions(-) delete mode 100644 CMakeScripts/Modules/FindSigC++.cmake delete mode 100644 CMakeScripts/Modules/sigcpp_test.cpp (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index ad2d51724..d66541604 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -379,9 +379,6 @@ if(WITH_NLS) endif(GETTEXT_FOUND) endif(WITH_NLS) -#sets c++11 for newer sigc++ if required when pkg-config does not detect it -find_package(SigC++ REQUIRED) - pkg_check_modules(SIGC++ REQUIRED sigc++-2.0 ) list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS}) diff --git a/CMakeScripts/Modules/FindSigC++.cmake b/CMakeScripts/Modules/FindSigC++.cmake deleted file mode 100644 index 14cbf47f7..000000000 --- a/CMakeScripts/Modules/FindSigC++.cmake +++ /dev/null @@ -1,128 +0,0 @@ -# - Try to find SIGC++ -# Once done this will define -# -# SIGC++_FOUND - system has SIGC++ -# SIGC++_INCLUDE_DIRS - the SIGC++ include directory -# SIGC++_LIBRARIES - Link these to use SIGC++ -# SIGC++_DEFINITIONS - Compiler switches required for using SIGC++ -# -# Copyright (c) 2008 Andreas Schneider -# -# Redistribution and use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# - -if (SIGC++_LIBRARIES AND SIGC++_INCLUDE_DIRS) - # in cache already - set(SIGC++_FOUND TRUE) -else (SIGC++_LIBRARIES AND SIGC++_INCLUDE_DIRS) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - include(UsePkgConfig) - pkgconfig(sigc++-2.0 _SIGC++_INCLUDEDIR _SIGC++_LIBDIR _SIGC++_LDFLAGS _SIGC++_CFLAGS) - else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(_SIGC++ sigc++-2.0) - endif (PKG_CONFIG_FOUND) - endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - - find_path(SIGC++_INCLUDE_DIR - NAMES - sigc++/sigc++.h - PATHS - ${_SIGC++_INCLUDEDIR} - /usr/include - /usr/local/include - /opt/local/include - /sw/include - PATH_SUFFIXES - sigc++-2.0 - ) - - find_path(SIGC++_CONFIG_INCLUDE_DIR - NAMES - sigc++config.h - PATHS - ${_SIGC++_INCLUDEDIR} - /usr/include - /usr/local/include - /opt/local/include - /opt/local/lib/sigc++-2.0/include - /sw/include - /usr/lib/sigc++-2.0/include - /usr/lib64/sigc++-2.0/include - ) - - find_library(SIGC-2.0_LIBRARY - NAMES - sigc-2.0 - PATHS - ${_SIGC++_LIBDIR} - /usr/lib - /usr/local/lib - /opt/local/lib - /sw/lib - ) - - if (SIGC-2.0_LIBRARY) - set(SIGC-2.0_FOUND TRUE) - endif (SIGC-2.0_LIBRARY) - - set(SIGC++_INCLUDE_DIRS - ${SIGC++_INCLUDE_DIR} - ${SIGC++_CONFIG_INCLUDE_DIR} - ) - - if (SIGC-2.0_FOUND) - set(SIGC++_LIBRARIES - ${SIGC++_LIBRARIES} - ${SIGC-2.0_LIBRARY} - ) - endif (SIGC-2.0_FOUND) - - if (SIGC++_INCLUDE_DIRS AND SIGC++_LIBRARIES) - set(SIGC++_FOUND TRUE) - endif (SIGC++_INCLUDE_DIRS AND SIGC++_LIBRARIES) - - if (SIGC++_FOUND) - if (NOT SIGC++_FIND_QUIETLY) - message(STATUS "Found SIGC++: ${SIGC++_LIBRARIES}") - endif (NOT SIGC++_FIND_QUIETLY) - else (SIGC++_FOUND) - if (SIGC++_FIND_REQUIRED) - message(FATAL_ERROR "Could not find SIGC++") - endif (SIGC++_FIND_REQUIRED) - endif (SIGC++_FOUND) - - # show the SIGC++_INCLUDE_DIRS and SIGC++_LIBRARIES variables only in the advanced view - mark_as_advanced(SIGC++_INCLUDE_DIRS SIGC++_LIBRARIES) - -endif (SIGC++_LIBRARIES AND SIGC++_INCLUDE_DIRS) - -# Try to add -std=c++11 if needed - see: -# https://bugs.launchpad.net/inkscape/+bug/1488079 - -macro (sigcpp_compile extra_cppflags) - set(sigcpp_compile_output "") - try_compile(SIGCPP_COMPILES_FINE "${CMAKE_BINARY_DIR}/sigcpp-bindir" - SOURCES "${CMAKE_SOURCE_DIR}/CMakeScripts/Modules/sigcpp_test.cpp" - COMPILE_DEFINITIONS ${_SIGC++_CFLAGS} ${extra_cppflags} - LINK_LIBRARIES ${SIGC++_LIBRARIES} - OUTPUT_VARIABLE sigcpp_compile_output) -endmacro() - - -sigcpp_compile("") -if (NOT "${SIGCPP_COMPILES_FINE}") - set (cppflag "-std=c++11") - sigcpp_compile("${cppflag}") - if ("${SIGCPP_COMPILES_FINE}") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cppflag}") - else() - message(FATAL_ERROR "Could not compile against SIGC++ - output is <<${sigcpp_compile_output}>>") - endif() -endif() - diff --git a/CMakeScripts/Modules/sigcpp_test.cpp b/CMakeScripts/Modules/sigcpp_test.cpp deleted file mode 100644 index b4cf2c773..000000000 --- a/CMakeScripts/Modules/sigcpp_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Building this using: - - g++ `pkg-config --cflags sigc++-2.0` sigcpp_test.cpp - - Results in an error. - * */ -#include -#include -#include - -int main() -{ - return 0; -} -- cgit v1.2.3 From e0a83507e07588b45c83c003bee116e4d74e0c5d Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 13 Feb 2017 20:34:06 +0100 Subject: CMake: Include GSettings schemas into Windows installation Fixes crash issue when trying to use GTK file dialogs (error: "GLib-GIO-ERROR **: No GSettings schemas are installed on the system") Fixed bugs: - https://launchpad.net/bugs/1663884 - https://launchpad.net/bugs/1663999 (bzr r15514) --- CMakeScripts/Install.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 01db2644c..fc82172e7 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -208,6 +208,9 @@ if(WIN32) install(DIRECTORY ${DEVLIBS_PATH}/share/poppler DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + install(DIRECTORY ${DEVLIBS_PATH}/share/glib-2.0/schemas + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/glib-2.0) + install(DIRECTORY ${DEVLIBS_PATH}/etc/fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) -- cgit v1.2.3 From 30a0802e0a6ccbb37a76e816aa47ebf08e2b548d Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 13 Feb 2017 22:41:13 +0100 Subject: CMake: Cosmetic fix for version string (set concatenates arguments with a semicolon ";") (bzr r15517) --- CMakeScripts/inkscape-version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 11316101f..2e23925c4 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -22,7 +22,7 @@ if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") - set(INKSCAPE_REVISION ${INKSCAPE_REVISION} " " ${INKSCAPE_CUSTOM}) + set(INKSCAPE_REVISION "${INKSCAPE_REVISION} ${INKSCAPE_CUSTOM}") endif() endif() message("revision is " ${INKSCAPE_REVISION}) -- cgit v1.2.3 From 4def15d764671b9f1de73d5d7389264cb65eddb9 Mon Sep 17 00:00:00 2001 From: mathog <> Date: Fri, 17 Feb 2017 09:31:47 -0800 Subject: partial fix bug 1640899 (bzr r15527) --- CMakeScripts/DefineDependsandFlags.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index d66541604..90df50c6d 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -85,19 +85,21 @@ if(WITH_GNOME_VFS) endif() if(ENABLE_LCMS) + unset(HAVE_LIBLCMS1) + unset(HAVE_LIBLCMS2) find_package(LCMS2) if(LCMS2_FOUND) list(APPEND INKSCAPE_INCS_SYS ${LCMS2_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${LCMS2_LIBRARIES}) add_definitions(${LCMS2_DEFINITIONS}) - set (HAVE_LIBLCMS2 1) + set (HAVE_LIBLCMS2 ON) else() find_package(LCMS) if(LCMS_FOUND) list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES}) add_definitions(${LCMS_DEFINITIONS}) - set (HAVE_LIBLCMS1 1) + set (HAVE_LIBLCMS1 ON) else() set(ENABLE_LCMS OFF) endif() @@ -247,7 +249,7 @@ endif() # CMake's builtin # ---------------------------------------------------------------------------- -set(TRY_GTKSPELL 1) +set(TRY_GTKSPELL ON) # Include dependencies: # use patched version until GTK2_CAIROMMCONFIG_INCLUDE_DIR is added pkg_check_modules( @@ -270,14 +272,15 @@ set(TRY_GTKSPELL 1) if("${GTKMM_3_10_FOUND}") message("Using Gtkmm 3.10 build") - set (WITH_GTKMM_3_10 1) + set (WITH_GTKMM_3_10 ON) endif() pkg_check_modules(GDL_3_6 gdl-3.0>=3.6) if("${GDL_3_6_FOUND}") message("Using GDL 3.6 or higher") - set (WITH_GDL_3_6 1) + add_definitions(-DWITH_GDL_3_6) + set (WITH_GDL_3_6 ON) endif() set(TRY_GTKSPELL ) @@ -285,7 +288,7 @@ set(TRY_GTKSPELL 1) if("${GTKSPELL3_FOUND}") message("Using GtkSpell 3") - set (WITH_GTKSPELL 1) + set (WITH_GTKSPELL ON) else() unset(WITH_GTKSPELL) endif() -- cgit v1.2.3 From 3e4fbb2d79bf7e1abb902112f9a54dc427f1a5a0 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 20 Feb 2017 22:21:18 +0100 Subject: CMake: Generate a dummy file in hicolor/index.theme to avoid bug 1659336 on Windows Fixed bugs: - https://launchpad.net/bugs/1659336 (bzr r15535) --- CMakeScripts/Install.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index fc82172e7..64ab4607b 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -195,6 +195,10 @@ if(WIN32) PATTERN CMakeLists.txt EXCLUDE PATTERN *.am EXCLUDE) + # Generate a dummy file in hicolor/index.theme to avoid bug 1635207 + file(GENERATE OUTPUT ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/index.theme + CONTENT "[Icon Theme]\nName=hicolor\nDirectories=") + install(DIRECTORY ${DEVLIBS_PATH}/share/icons/Adwaita DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons) -- cgit v1.2.3 From e0cfcecca077b96759bc3709195a93d8ea0c48d6 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 4 Mar 2017 21:39:01 +0100 Subject: Support for building with MSYS2 See Wiki for build instructions: http://wiki.inkscape.org/wiki/index.php/Compiling_Inkscape_on_Windows_with_MSYS2 (bzr r15564) --- CMakeScripts/ConfigEnv.cmake | 6 +- CMakeScripts/InstallMSYS2.cmake | 228 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 232 insertions(+), 2 deletions(-) create mode 100644 CMakeScripts/InstallMSYS2.cmake (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake index ebd005cb3..dc4c70ba3 100644 --- a/CMakeScripts/ConfigEnv.cmake +++ b/CMakeScripts/ConfigEnv.cmake @@ -6,8 +6,10 @@ if(WIN32) include(mingwenv.cmake) - list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH}) - list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH}) + if(NOT HAVE_MSYS2) + list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH}) + list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH}) + endif() set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe") set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe") diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake new file mode 100644 index 000000000..72069033c --- /dev/null +++ b/CMakeScripts/InstallMSYS2.cmake @@ -0,0 +1,228 @@ +if(WIN32) + install(PROGRAMS + ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe + ${EXECUTABLE_OUTPUT_PATH}/inkview.exe + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + + install(PROGRAMS + ${EXECUTABLE_OUTPUT_PATH}/inkscape_com.exe + DESTINATION ${CMAKE_INSTALL_PREFIX} + RENAME inkscape.com + ) + + install(FILES + ${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + + install(FILES + AUTHORS + COPYING + NEWS + README + TRANSLATORS + GPL2.txt + GPL3.txt + LGPL2.1.txt + DESTINATION ${CMAKE_INSTALL_PREFIX}) + + # mingw dlls + install(FILES + ${MINGW_BIN}/LIBEAY32.dll + ${MINGW_BIN}/SSLEAY32.dll + ${MINGW_BIN}/libMagick++-6.Q16HDRI-6.dll + ${MINGW_BIN}/libMagickCore-6.Q16HDRI-2.dll + ${MINGW_BIN}/libMagickWand-6.Q16HDRI-2.dll + ${MINGW_BIN}/libaspell-15.dll + ${MINGW_BIN}/libatk-1.0-0.dll + ${MINGW_BIN}/libatkmm-1.6-1.dll + ${MINGW_BIN}/libbz2-1.dll + ${MINGW_BIN}/libcairo-2.dll + ${MINGW_BIN}/libcairo-gobject-2.dll + ${MINGW_BIN}/libcairomm-1.0-1.dll + ${MINGW_BIN}/libcdr-0.1.dll + ${MINGW_BIN}/libcurl-4.dll + ${MINGW_BIN}/libenchant.dll + ${MINGW_BIN}/libepoxy-0.dll + ${MINGW_BIN}/libexpat-1.dll + ${MINGW_BIN}/libffi-6.dll + ${MINGW_BIN}/libfftw3-3.dll + ${MINGW_BIN}/libfontconfig-1.dll + ${MINGW_BIN}/libfreetype-6.dll + ${MINGW_BIN}/libgc-1.dll + ${MINGW_BIN}/libgdk-3-0.dll + ${MINGW_BIN}/libgdk_pixbuf-2.0-0.dll + ${MINGW_BIN}/libgdkmm-3.0-1.dll + ${MINGW_BIN}/libgdl-3-5.dll + ${MINGW_BIN}/libgio-2.0-0.dll + ${MINGW_BIN}/libgiomm-2.4-1.dll + ${MINGW_BIN}/libglib-2.0-0.dll + ${MINGW_BIN}/libglibmm-2.4-1.dll + ${MINGW_BIN}/libgmodule-2.0-0.dll + ${MINGW_BIN}/libgmp-10.dll + ${MINGW_BIN}/libgnutls-30.dll + ${MINGW_BIN}/libgobject-2.0-0.dll + ${MINGW_BIN}/libgomp-1.dll + ${MINGW_BIN}/libgraphite2.dll + ${MINGW_BIN}/libgsl-19.dll + ${MINGW_BIN}/libgslcblas-0.dll + ${MINGW_BIN}/libgtk-3-0.dll + ${MINGW_BIN}/libgtkmm-3.0-1.dll + ${MINGW_BIN}/libgtkspell3-3-0.dll + ${MINGW_BIN}/libharfbuzz-0.dll + ${MINGW_BIN}/libhogweed-4.dll + ${MINGW_BIN}/libiconv-2.dll + ${MINGW_BIN}/libicudt57.dll + ${MINGW_BIN}/libicuin57.dll + ${MINGW_BIN}/libicuuc57.dll + ${MINGW_BIN}/libidn-11.dll + ${MINGW_BIN}/libintl-8.dll + ${MINGW_BIN}/libjpeg-8.dll + ${MINGW_BIN}/liblcms2-2.dll + ${MINGW_BIN}/liblqr-1-0.dll + ${MINGW_BIN}/libltdl-7.dll + ${MINGW_BIN}/liblzma-5.dll + ${MINGW_BIN}/libnettle-6.dll + ${MINGW_BIN}/libnghttp2-14.dll + ${MINGW_BIN}/libnspr4.dll + ${MINGW_BIN}/libopenjp2-7.dll + ${MINGW_BIN}/libp11-kit-0.dll + ${MINGW_BIN}/libpango-1.0-0.dll + ${MINGW_BIN}/libpangocairo-1.0-0.dll + ${MINGW_BIN}/libpangoft2-1.0-0.dll + ${MINGW_BIN}/libpangomm-1.4-1.dll + ${MINGW_BIN}/libpangowin32-1.0-0.dll + ${MINGW_BIN}/libpcre-1.dll + ${MINGW_BIN}/libpixman-1-0.dll + ${MINGW_BIN}/libplc4.dll + ${MINGW_BIN}/libplds4.dll + ${MINGW_BIN}/libpng16-16.dll + ${MINGW_BIN}/libpoppler-66.dll + ${MINGW_BIN}/libpoppler-glib-8.dll + ${MINGW_BIN}/libpopt-0.dll + ${MINGW_BIN}/libpotrace-0.dll + ${MINGW_BIN}/librevenge-0.0.dll + ${MINGW_BIN}/librevenge-stream-0.0.dll + ${MINGW_BIN}/librtmp-1.dll + ${MINGW_BIN}/libsigc-2.0-0.dll + ${MINGW_BIN}/libssh2-1.dll + ${MINGW_BIN}/libstdc++-6.dll + ${MINGW_BIN}/libtasn1-6.dll + ${MINGW_BIN}/libtiff-5.dll + ${MINGW_BIN}/libunistring-2.dll + ${MINGW_BIN}/libvisio-0.1.dll + ${MINGW_BIN}/libwinpthread-1.dll + ${MINGW_BIN}/libwpd-0.10.dll + ${MINGW_BIN}/libwpg-0.3.dll + ${MINGW_BIN}/libxml2-2.dll + ${MINGW_BIN}/libxslt-1.dll + ${MINGW_BIN}/nss3.dll + ${MINGW_BIN}/nssutil3.dll + ${MINGW_BIN}/smime3.dll + ${MINGW_BIN}/zlib1.dll + # these are not picked up by 'ldd' but are required for SVG support in gdk-pixbuf-2.0 + ${MINGW_BIN}/libcroco-0.6-3.dll + ${MINGW_BIN}/librsvg-2-2.dll + # required by lxml + ${MINGW_BIN}/libexslt-0.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + # There are differences for 64-Bit and 32-Bit build environments. + if(HAVE_MINGW64) + install(FILES + ${MINGW_BIN}/libgcc_s_seh-1.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + else() + install(FILES + ${MINGW_BIN}/libgcc_s_dw2-1.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif() + + # Setup application data directories, poppler files, locales, icons and themes + file(MAKE_DIRECTORY + data + doc + modules + plugins) + + install(DIRECTORY + data + doc + modules + plugins + DESTINATION ${CMAKE_INSTALL_PREFIX} + PATTERN hicolor/index.theme EXCLUDE # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV. + PATTERN CMakeLists.txt EXCLUDE + PATTERN *.am EXCLUDE) + + # Generate a dummy file in hicolor/index.theme to avoid bug 1635207 + file(GENERATE OUTPUT ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/index.theme + CONTENT "[Icon Theme]\nName=hicolor\nDirectories=") + + install(DIRECTORY ${MINGW_PATH}/share/icons/Adwaita + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons) + + install(DIRECTORY ${MINGW_PATH}/share/themes + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${MINGW_PATH}/share/locale + DESTINATION ${CMAKE_INSTALL_PREFIX}/share + PATTERN "*gtk20.mo" EXCLUDE) + + install(DIRECTORY ${MINGW_PATH}/share/poppler + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${MINGW_PATH}/share/glib-2.0/schemas + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/glib-2.0) + + install(DIRECTORY ${MINGW_PATH}/etc/fonts + DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + + # GTK 3.0 + install(DIRECTORY ${MINGW_LIB}/gtk-3.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + FILES_MATCHING + PATTERN "*.dll" + PATTERN "*.cache") + + install(DIRECTORY ${MINGW_PATH}/etc/gtk-3.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + + install(DIRECTORY ${MINGW_LIB}/gdk-pixbuf-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + FILES_MATCHING + PATTERN "*.dll" + PATTERN "*.cache") + + # Aspell dictionaries + install(DIRECTORY ${MINGW_LIB}/aspell-0.60 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + + # Necessary to run extensions on windows if it is not in the path + if (HAVE_MINGW64) + install(FILES + ${MINGW_BIN}/gspawn-win64-helper.exe + ${MINGW_BIN}/gspawn-win64-helper-console.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + else() + install(FILES + ${MINGW_BIN}/gspawn-win32-helper.exe + ${MINGW_BIN}/gspawn-win32-helper-console.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif() + + # Python (a bit hacky for backwards compatibility with devlibs at this point) + install(FILES + ${MINGW_BIN}/python2.exe + RENAME python.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(FILES + ${MINGW_BIN}/python2w.exe + RENAME pythonw.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(FILES + ${MINGW_BIN}/libpython2.7.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(DIRECTORY ${MINGW_LIB}/python2.7 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) +endif() \ No newline at end of file -- cgit v1.2.3 From 0140ace54f213a01c6e24e0e12179eeae8fe8a38 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 5 Mar 2017 04:31:55 +0100 Subject: CMake: python2-numpy was missing dependencies (bzr r15566) --- CMakeScripts/InstallMSYS2.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 72069033c..3cfc9c20c 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -124,8 +124,12 @@ if(WIN32) # these are not picked up by 'ldd' but are required for SVG support in gdk-pixbuf-2.0 ${MINGW_BIN}/libcroco-0.6-3.dll ${MINGW_BIN}/librsvg-2-2.dll - # required by lxml + # required by python2-lxml ${MINGW_BIN}/libexslt-0.dll + # required by python2-numpy + ${MINGW_BIN}/libgfortran-3.dll + ${MINGW_BIN}/libopenblas.dll + ${MINGW_BIN}/libquadmath-0.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) # There are differences for 64-Bit and 32-Bit build environments. if(HAVE_MINGW64) -- cgit v1.2.3 From 0ae428950e2a20ead42222f9f4752193fa7691c6 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Wed, 8 Mar 2017 22:25:30 +0100 Subject: CMake: Assume mingw-w64 for MinGW builds (should be a safe assumption, if not let me know...) This resolves the "mingw-w64" vs. "MinGW 64-bit" ambiguity of the "HAVE_MINGW64" cmake variable (which worked before as devlibs = 32bit = mingw; devlibs64 = 64-bit = mingw-w64), but is not senseful for newer 32-bit MinGW builds that are based on mingw-w64, too. (bzr r15579) --- CMakeScripts/DefineDependsandFlags.cmake | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 90df50c6d..29ccb3a91 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -23,21 +23,16 @@ list(APPEND INKSCAPE_CXX_FLAGS "-std=c++11") if(WIN32) # Set the link and include directories get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) - - # MinGW supplied STL does not define these floating point constants.. :/ - add_definitions(-DFLT_EPSILON=1e-9) - add_definitions(-DFLT_MAX=1e+37) - add_definitions(-DFLT_MIN=1e-37) list(APPEND INKSCAPE_LIBS "-lmscms") list(APPEND INKSCAPE_CXX_FLAGS "-mwindows") list(APPEND INKSCAPE_CXX_FLAGS "-mthreads") + + list(APPEND INKSCAPE_LIBS "-lgomp") + list(APPEND INKSCAPE_LIBS "-lwinpthread") if(HAVE_MINGW64) - list(APPEND INKSCAPE_LIBS "-lgomp") - list(APPEND INKSCAPE_LIBS "-lwinpthread") - list(APPEND INKSCAPE_CXX_FLAGS "-m64") else() list(APPEND INKSCAPE_CXX_FLAGS "-m32") -- cgit v1.2.3 From 0c9751c69184c11fea5f4f5e27074f1b21abb9da Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Thu, 9 Mar 2017 00:03:24 +0100 Subject: CMake: Prefer to install the genuine /hicolor/index.theme file in MSYS2 installs This avoids the issues hiughlighted by su_v in https://bugs.launchpad.net/inkscape/+bug/1659336/comments/5 (bzr r15581) --- CMakeScripts/InstallMSYS2.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 3cfc9c20c..63c6f0c4c 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -159,9 +159,10 @@ if(WIN32) PATTERN CMakeLists.txt EXCLUDE PATTERN *.am EXCLUDE) - # Generate a dummy file in hicolor/index.theme to avoid bug 1635207 - file(GENERATE OUTPUT ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/index.theme - CONTENT "[Icon Theme]\nName=hicolor\nDirectories=") + # Install hicolor/index.theme to avoid bug 1635207 + install(FILES + ${MINGW_PATH}/share/icons/hicolor/index.theme + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor) install(DIRECTORY ${MINGW_PATH}/share/icons/Adwaita DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons) -- cgit v1.2.3 From 81fcb041da64d709e6fffb815b0a520ffacdebff Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Thu, 9 Mar 2017 00:07:18 +0100 Subject: CMake: Don't install /share/themes on Windows There's nothing we want but stuff we definitely don't need. (bzr r15582) --- CMakeScripts/Install.cmake | 3 --- CMakeScripts/InstallMSYS2.cmake | 3 --- 2 files changed, 6 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 64ab4607b..57c16b038 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -202,9 +202,6 @@ if(WIN32) install(DIRECTORY ${DEVLIBS_PATH}/share/icons/Adwaita DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons) - install(DIRECTORY ${DEVLIBS_PATH}/share/themes - DESTINATION ${CMAKE_INSTALL_PREFIX}/share) - install(DIRECTORY ${DEVLIBS_PATH}/share/locale DESTINATION ${CMAKE_INSTALL_PREFIX}/share PATTERN "*gtk20.mo" EXCLUDE) diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 63c6f0c4c..fae4dacce 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -167,9 +167,6 @@ if(WIN32) install(DIRECTORY ${MINGW_PATH}/share/icons/Adwaita DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons) - install(DIRECTORY ${MINGW_PATH}/share/themes - DESTINATION ${CMAKE_INSTALL_PREFIX}/share) - install(DIRECTORY ${MINGW_PATH}/share/locale DESTINATION ${CMAKE_INSTALL_PREFIX}/share PATTERN "*gtk20.mo" EXCLUDE) -- cgit v1.2.3 From 3475114e7d20d9402f2fba8d4603c3bd6131c571 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Thu, 9 Mar 2017 00:14:40 +0100 Subject: CMake: Don't install /share/locale on Windows We only ever wanted "gtk30.mo" for translation of stock items. - As we stripped all stock items from our source we don't need it anymore - As there are *lots* of translations in MSYS2 we installed a huge amount of unneeded files (bzr r15583) --- CMakeScripts/Install.cmake | 4 ---- CMakeScripts/InstallMSYS2.cmake | 4 ---- 2 files changed, 8 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 57c16b038..9250f3d00 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -202,10 +202,6 @@ if(WIN32) install(DIRECTORY ${DEVLIBS_PATH}/share/icons/Adwaita DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons) - install(DIRECTORY ${DEVLIBS_PATH}/share/locale - DESTINATION ${CMAKE_INSTALL_PREFIX}/share - PATTERN "*gtk20.mo" EXCLUDE) - install(DIRECTORY ${DEVLIBS_PATH}/share/poppler DESTINATION ${CMAKE_INSTALL_PREFIX}/share) diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index fae4dacce..87867ff73 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -167,10 +167,6 @@ if(WIN32) install(DIRECTORY ${MINGW_PATH}/share/icons/Adwaita DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons) - install(DIRECTORY ${MINGW_PATH}/share/locale - DESTINATION ${CMAKE_INSTALL_PREFIX}/share - PATTERN "*gtk20.mo" EXCLUDE) - install(DIRECTORY ${MINGW_PATH}/share/poppler DESTINATION ${CMAKE_INSTALL_PREFIX}/share) -- cgit v1.2.3