From ac4b018a2970d4da9d2e83198274137fac497548 Mon Sep 17 00:00:00 2001 From: houz Date: Sun, 16 Aug 2015 02:13:02 +0200 Subject: Added translations to the cmake build (1451236) Fixed bugs: - https://launchpad.net/bugs/1451236 (bzr r14304) --- CMakeScripts/DefineDependsandFlags.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index a4dad21b1..8d6405265 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -355,6 +355,19 @@ if(WITH_IMAGE_MAGICK) endif() include(${CMAKE_CURRENT_LIST_DIR}/IncludeJava.cmake) + +set(ENABLE_NLS OFF) +if(WITH_NLS) + find_package(Gettext) + if(GETTEXT_FOUND) + message(STATUS "Found gettext + msgfmt to convert language files. Translation enabled") + set(ENABLE_NLS ON) + else(GETTEXT_FOUND) + message(STATUS "Cannot find gettext + msgfmt to convert language file. Translation won't be enabled") + endif(GETTEXT_FOUND) +endif(WITH_NLS) + + # end Dependencies list(REMOVE_DUPLICATES INKSCAPE_LIBS) -- cgit v1.2.3 From 6e64fe28600be374c09f456d6b0076a5fc02f02c Mon Sep 17 00:00:00 2001 From: su_v Date: Wed, 2 Sep 2015 19:25:24 +0200 Subject: cmake: make JPEG optional; fix using it (if found) (bzr r14341) --- CMakeScripts/DefineDependsandFlags.cmake | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 8d6405265..e6089daa4 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -181,13 +181,12 @@ if(WITH_LIBCDR) endif() endif() -FIND_PACKAGE(JPEG REQUIRED) -#IF(JPEG_FOUND) - #INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) - #TARGET_LINK_LIBRARIES(mpo ${JPEG_LIBRARIES}) -#ENDIF() -list(APPEND INKSCAPE_INCS_SYS ${JPEG_INCLUDE_DIR}) -list(APPEND INKSCAPE_LIBS ${JPEG_LIBRARIES}) +FIND_PACKAGE(JPEG) +IF(JPEG_FOUND) + list(APPEND INKSCAPE_INCS_SYS ${JPEG_INCLUDE_DIR}) + list(APPEND INKSCAPE_LIBS ${JPEG_LIBRARIES}) + set(HAVE_JPEG ON) +ENDIF() find_package(PNG REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${PNG_PNG_INCLUDE_DIR}) -- cgit v1.2.3 From 0d4e511c524d9102d90adbf2defea4f644eb3edd Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Mon, 26 Oct 2015 23:50:52 +0100 Subject: add gtk3 experimental support in CMake Fixed bugs: - https://launchpad.net/bugs/1509969 (bzr r14430) --- CMakeScripts/DefineDependsandFlags.cmake | 148 +++++++++++++++++++++---------- 1 file changed, 100 insertions(+), 48 deletions(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index e6089daa4..63e4315b8 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -220,55 +220,107 @@ endif() # CMake's builtin # ---------------------------------------------------------------------------- +SET (TRY_GTKSPELL 1) # Include dependencies: # use patched version until GTK2_CAIROMMCONFIG_INCLUDE_DIR is added -find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) -list(APPEND INKSCAPE_INCS_SYS - ${GTK2_GDK_INCLUDE_DIR} - ${GTK2_GDKMM_INCLUDE_DIR} - ${GTK2_GDK_PIXBUF_INCLUDE_DIR} - ${GTK2_GDKCONFIG_INCLUDE_DIR} - ${GTK2_GDKMMCONFIG_INCLUDE_DIR} - ${GTK2_GLIB_INCLUDE_DIR} - ${GTK2_GLIBCONFIG_INCLUDE_DIR} - ${GTK2_GLIBMM_INCLUDE_DIR} - ${GTK2_GLIBMMCONFIG_INCLUDE_DIR} - ${GTK2_GTK_INCLUDE_DIR} - ${GTK2_GTKMM_INCLUDE_DIR} - ${GTK2_GTKMMCONFIG_INCLUDE_DIR} - ${GTK2_ATK_INCLUDE_DIR} - ${GTK2_ATKMM_INCLUDE_DIR} - ${GTK2_PANGO_INCLUDE_DIR} - ${GTK2_PANGOMM_INCLUDE_DIR} - ${GTK2_PANGOMMCONFIG_INCLUDE_DIR} - ${GTK2_CAIRO_INCLUDE_DIR} - ${GTK2_CAIROMM_INCLUDE_DIR} - ${GTK2_CAIROMMCONFIG_INCLUDE_DIR} # <-- not in cmake 2.8.4 - ${GTK2_GIOMM_INCLUDE_DIR} - ${GTK2_GIOMMCONFIG_INCLUDE_DIR} - ${GTK2_SIGC++_INCLUDE_DIR} - ${GTK2_SIGC++CONFIG_INCLUDE_DIR} -) - -list(APPEND INKSCAPE_LIBS - ${GTK2_GDK_LIBRARY} - ${GTK2_GDKMM_LIBRARY} - ${GTK2_GDK_PIXBUF_LIBRARY} - ${GTK2_GLIB_LIBRARY} - ${GTK2_GLIBMM_LIBRARY} - ${GTK2_GTK_LIBRARY} - ${GTK2_GTKMM_LIBRARY} - ${GTK2_ATK_LIBRARY} - ${GTK2_ATKMM_LIBRARY} - ${GTK2_PANGO_LIBRARY} - ${GTK2_PANGOMM_LIBRARY} - ${GTK2_CAIRO_LIBRARY} - ${GTK2_CAIROMM_LIBRARY} - ${GTK2_GIOMM_LIBRARY} - ${GTK2_SIGC++_LIBRARY} - ${GTK2_GOBJECT_LIBRARY} -) - +IF ("${WITH_GTK3_EXPERIMENTAL}") + pkg_check_modules( + GTK + REQUIRED + gtkmm-3.0>=3.2 + gdkmm-3.0>=3.2 + gtk+-3.0>=3.2 + gdk-3.0>=3.2 + gdl-3.0>=3.3.5 + ) + message("Using EXPERIMENTAL Gtkmm 3 build") + SET (WITH_GTKMM_3_0 1) + message("Using external GDL") + SET(WITH_EXT_GDL 1) + + # Check whether we can use new features in Gtkmm 3.10 + # TODO: Drop this test and bump the version number in the GTK test above + # as soon as all supported distributions provide Gtkmm >= 3.10 + pkg_check_modules(GTKMM_3_10 + gtkmm-3.0>=3.10, + ) + + IF ("${GTKMM_3_10_FOUND}") + message("Using Gtkmm 3.10 build") + SET (WITH_GTKMM_3_10 1) + 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) + ENDIF() + + SET (TRY_GTKSPELL ) + pkg_check_modules(GTKSPELL3 gtkspell3-3.0) + + IF ("${GTKSPELL3_FOUND}") + message("Using GtkSpell3 3.0") + SET (WITH_GTKSPELL 1) + ENDIF() + list(APPEND INKSCAPE_INCS_SYS + ${GTK_INCLUDE_DIRS} + ${GTKSPELL3_INCLUDE_DIRS} + ) + + list(APPEND INKSCAPE_LIBS + ${GTK_LIBRARIES} + ${GTKSPELL3_LIBRARIES} + ) +ELSE() + find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) + list(APPEND INKSCAPE_INCS_SYS + ${GTK2_GDK_INCLUDE_DIR} + ${GTK2_GDKMM_INCLUDE_DIR} + ${GTK2_GDK_PIXBUF_INCLUDE_DIR} + ${GTK2_GDKCONFIG_INCLUDE_DIR} + ${GTK2_GDKMMCONFIG_INCLUDE_DIR} + ${GTK2_GLIB_INCLUDE_DIR} + ${GTK2_GLIBCONFIG_INCLUDE_DIR} + ${GTK2_GLIBMM_INCLUDE_DIR} + ${GTK2_GLIBMMCONFIG_INCLUDE_DIR} + ${GTK2_GTK_INCLUDE_DIR} + ${GTK2_GTKMM_INCLUDE_DIR} + ${GTK2_GTKMMCONFIG_INCLUDE_DIR} + ${GTK2_ATK_INCLUDE_DIR} + ${GTK2_ATKMM_INCLUDE_DIR} + ${GTK2_PANGO_INCLUDE_DIR} + ${GTK2_PANGOMM_INCLUDE_DIR} + ${GTK2_PANGOMMCONFIG_INCLUDE_DIR} + ${GTK2_CAIRO_INCLUDE_DIR} + ${GTK2_CAIROMM_INCLUDE_DIR} + ${GTK2_CAIROMMCONFIG_INCLUDE_DIR} # <-- not in cmake 2.8.4 + ${GTK2_GIOMM_INCLUDE_DIR} + ${GTK2_GIOMMCONFIG_INCLUDE_DIR} + ${GTK2_SIGC++_INCLUDE_DIR} + ${GTK2_SIGC++CONFIG_INCLUDE_DIR} + ) + + list(APPEND INKSCAPE_LIBS + ${GTK2_GDK_LIBRARY} + ${GTK2_GDKMM_LIBRARY} + ${GTK2_GDK_PIXBUF_LIBRARY} + ${GTK2_GLIB_LIBRARY} + ${GTK2_GLIBMM_LIBRARY} + ${GTK2_GTK_LIBRARY} + ${GTK2_GTKMM_LIBRARY} + ${GTK2_ATK_LIBRARY} + ${GTK2_ATKMM_LIBRARY} + ${GTK2_PANGO_LIBRARY} + ${GTK2_PANGOMM_LIBRARY} + ${GTK2_CAIRO_LIBRARY} + ${GTK2_CAIROMM_LIBRARY} + ${GTK2_GIOMM_LIBRARY} + ${GTK2_SIGC++_LIBRARY} + ${GTK2_GOBJECT_LIBRARY} + ) +ENDIF() find_package(Freetype REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS}) @@ -286,7 +338,7 @@ if(ASPELL_FOUND) set(HAVE_ASPELL TRUE) endif() -if(WITH_GTKSPELL) +if("${TRY_GTKSPELL}" AND "${WITH_GTKSPELL}") find_package(GtkSpell) if(GTKSPELL_FOUND) list(APPEND INKSCAPE_INCS_SYS ${GTKSPELL_INCLUDE_DIR}) -- cgit v1.2.3 From 6484d2580d5facccf1b4bd7719c5d26fb8d07602 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 9 Nov 2015 00:03:27 +0000 Subject: Add CMake check for Potrace from OSP: http://goo.gl/AEzbkQ Fixed bugs: - https://launchpad.net/bugs/1156664 (bzr r14449.1.3) --- CMakeScripts/DefineDependsandFlags.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 63e4315b8..e0857f265 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -197,6 +197,10 @@ list(APPEND INKSCAPE_INCS_SYS ${POPT_INCLUDE_DIR}) list(APPEND INKSCAPE_LIBS ${POPT_LIBRARIES}) add_definitions(${POPT_DEFINITIONS}) +find_package(Potrace REQUIRED) +list(APPEND INKSCAPE_INCS_SYS ${POTRACE_INCLUDE_DIR}) +list(APPEND INKSCAPE_LIBS ${POTRACE_LIBRARIES}) + if(WITH_DBUS) find_package(DBus REQUIRED) if(DBUS_FOUND) -- cgit v1.2.3 From ac1a99494b6afaf5673f260f0e75559eff3b5ff5 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 12 Nov 2015 22:35:18 +0000 Subject: Update cmake Potrace module to match style of others (bzr r14449.1.5) --- CMakeScripts/DefineDependsandFlags.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index e0857f265..ea0867535 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -198,7 +198,7 @@ list(APPEND INKSCAPE_LIBS ${POPT_LIBRARIES}) add_definitions(${POPT_DEFINITIONS}) find_package(Potrace REQUIRED) -list(APPEND INKSCAPE_INCS_SYS ${POTRACE_INCLUDE_DIR}) +list(APPEND INKSCAPE_INCS_SYS ${POTRACE_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${POTRACE_LIBRARIES}) if(WITH_DBUS) -- cgit v1.2.3 From ec3c0a24bb14d96bfcef72cdd72326fce2790eff Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 12 Nov 2015 23:44:26 +0000 Subject: Fix CMake build (bzr r14449.1.6) --- CMakeScripts/DefineDependsandFlags.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index ea0867535..3f1d06e4c 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -197,9 +197,13 @@ list(APPEND INKSCAPE_INCS_SYS ${POPT_INCLUDE_DIR}) list(APPEND INKSCAPE_LIBS ${POPT_LIBRARIES}) add_definitions(${POPT_DEFINITIONS}) -find_package(Potrace REQUIRED) -list(APPEND INKSCAPE_INCS_SYS ${POTRACE_INCLUDE_DIRS}) -list(APPEND INKSCAPE_LIBS ${POTRACE_LIBRARIES}) +find_package(Potrace) +if(POTRACE_FOUND) + list(APPEND INKSCAPE_INCS_SYS ${POTRACE_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${POTRACE_LIBRARIES}) + set(HAVE_POTRACE ON) + add_definitions(-DHAVE_POTRACE) +endif() if(WITH_DBUS) find_package(DBus REQUIRED) -- cgit v1.2.3 From d4f332ed03e831ee781c1ba169bd7a35b2869989 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 21 Nov 2015 12:39:06 +0000 Subject: Add warning about missing Potrace to CMake build (bzr r14449.1.8) --- CMakeScripts/DefineDependsandFlags.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 3f1d06e4c..f4992de5d 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -203,6 +203,9 @@ if(POTRACE_FOUND) list(APPEND INKSCAPE_LIBS ${POTRACE_LIBRARIES}) set(HAVE_POTRACE ON) add_definitions(-DHAVE_POTRACE) +else(POTRACE_FOUND) + set(HAVE_POTRACE OFF) + message(STATUS "Could not locate the Potrace library headers: the Trace Bitmap and Paintbucket tools will be disabled") endif() if(WITH_DBUS) -- cgit v1.2.3