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 From 926cd79383db18f325adfbc24be8bb4fd32f06b9 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 27 Dec 2015 17:08:31 +0000 Subject: Apply Tav/suv patch to replace Pango OT functions with Harfbuzz Fixed bugs: - https://launchpad.net/bugs/1488159 (bzr r14549) --- 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 f4992de5d..14bb78416 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -21,6 +21,7 @@ if (WIN32) list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lharfbuzz-0.dll") # FIXME list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME elseif(APPLE) @@ -33,6 +34,7 @@ elseif(APPLE) endif() list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lharfbuzz") # FIXME list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME if(${GTK+_2.0_TARGET} MATCHES "x11") # only link X11 if using X11 backend of GTK2 @@ -42,6 +44,7 @@ else() list(APPEND INKSCAPE_LIBS "-ldl") # FIXME list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lharfbuzz") # FIXME list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME list(APPEND INKSCAPE_LIBS "-lX11") # FIXME endif() -- cgit v1.2.3 From b9e569809a4e82a5593c114c5839ae060c220b67 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 27 Dec 2015 18:35:20 +0000 Subject: Revert Pango/Harfbuzz fixes. Needs work (bzr r14552) --- CMakeScripts/DefineDependsandFlags.cmake | 3 --- 1 file changed, 3 deletions(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 14bb78416..f4992de5d 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -21,7 +21,6 @@ if (WIN32) list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lharfbuzz-0.dll") # FIXME list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME elseif(APPLE) @@ -34,7 +33,6 @@ elseif(APPLE) endif() list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lharfbuzz") # FIXME list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME if(${GTK+_2.0_TARGET} MATCHES "x11") # only link X11 if using X11 backend of GTK2 @@ -44,7 +42,6 @@ else() list(APPEND INKSCAPE_LIBS "-ldl") # FIXME list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lharfbuzz") # FIXME list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME list(APPEND INKSCAPE_LIBS "-lX11") # FIXME endif() -- cgit v1.2.3 From 0290dcac6a900038f2950f21efb95f495c1fc8de Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 11 Jan 2016 15:02:29 +0000 Subject: Update CMake for poppler >= 0.20.0 dependency (bzr r14574) --- CMakeScripts/DefineDependsandFlags.cmake | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index f4992de5d..e745b871f 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -105,14 +105,6 @@ if(ENABLE_POPPLER) set(HAVE_POPPLER_GLIB ON) endif() endif() - if(POPPLER_VERSION VERSION_GREATER "0.8.3" OR - POPPLER_VERSION VERSION_EQUAL "0.8.3") - set(POPPLER_NEW_GFXFONT ON) - endif() - if(POPPLER_VERSION VERSION_GREATER "0.12.2" OR - POPPLER_VERSION VERSION_EQUAL "0.12.2") - set(POPPLER_NEW_COLOR_SPACE_API ON) - endif() if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR POPPLER_VERSION VERSION_EQUAL "0.26.0") set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON) @@ -121,14 +113,6 @@ if(ENABLE_POPPLER) POPPLER_VERSION VERSION_EQUAL "0.29.0") set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) endif() - if(POPPLER_VERSION VERSION_GREATER "0.15.1" OR - POPPLER_VERSION VERSION_EQUAL "0.15.1") - set(POPPLER_NEW_GFXPATCH ON) - endif() - if(POPPLER_VERSION VERSION_GREATER "0.20.0" OR - POPPLER_VERSION VERSION_EQUAL "0.20.0") - set(POPPLER_NEW_ERRORAPI ON) - endif() else() set(ENABLE_POPPLER_CAIRO OFF) endif() -- cgit v1.2.3 From d278cb2d3be7ab401d6aae48fb39cabe8387f622 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 16 Jan 2016 23:05:58 -0800 Subject: cmake: Fix code style for consistency Indentation to 4 spaces Prefer lower case for functions and macros (bzr r14596) --- CMakeScripts/DefineDependsandFlags.cmake | 380 +++++++++++++++---------------- 1 file changed, 190 insertions(+), 190 deletions(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index e745b871f..f29b98a1f 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -4,10 +4,10 @@ set(INKSCAPE_INCS "") set(INKSCAPE_INCS_SYS "") list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR} - ${PROJECT_SOURCE_DIR}/src + ${PROJECT_SOURCE_DIR}/src - # generated includes - ${CMAKE_BINARY_DIR}/include + # generated includes + ${CMAKE_BINARY_DIR}/include ) # ---------------------------------------------------------------------------- @@ -17,55 +17,55 @@ list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR} find_package(GSL REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${GSL_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${GSL_LIBRARIES}) -if (WIN32) - list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME +if(WIN32) + list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME elseif(APPLE) - if(DEFINED ENV{CMAKE_PREFIX_PATH}) - # Adding the library search path explicitly seems not required - # if MacPorts is installed in default prefix ('/opt/local') - - # Cmake then can rely on the hard-coded paths in its modules. - # Only prepend search path if $CMAKE_PREFIX_PATH is defined: - list(APPEND INKSCAPE_LIBS "-L$ENV{CMAKE_PREFIX_PATH}/lib") # FIXME - endif() - list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME - if(${GTK+_2.0_TARGET} MATCHES "x11") - # only link X11 if using X11 backend of GTK2 - list(APPEND INKSCAPE_LIBS "-lX11") # FIXME - endif() -else() - list(APPEND INKSCAPE_LIBS "-ldl") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME + if(DEFINED ENV{CMAKE_PREFIX_PATH}) + # Adding the library search path explicitly seems not required + # if MacPorts is installed in default prefix ('/opt/local') - + # Cmake then can rely on the hard-coded paths in its modules. + # Only prepend search path if $CMAKE_PREFIX_PATH is defined: + list(APPEND INKSCAPE_LIBS "-L$ENV{CMAKE_PREFIX_PATH}/lib") # FIXME + endif() + list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME + if(${GTK+_2.0_TARGET} MATCHES "x11") + # only link X11 if using X11 backend of GTK2 list(APPEND INKSCAPE_LIBS "-lX11") # FIXME + endif() +else() + list(APPEND INKSCAPE_LIBS "-ldl") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME + list(APPEND INKSCAPE_LIBS "-lX11") # FIXME endif() list(APPEND INKSCAPE_LIBS "-lgslcblas") # FIXME if(WITH_GNOME_VFS) - find_package(GnomeVFS2) - if(GNOMEVFS2_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${GNOMEVFS2_INCLUDE_DIR}) - list(APPEND INKSCAPE_LIBS ${GNOMEVFS-2_LIBRARY}) - else() - set(WITH_GNOME_VFS OFF) - endif() + find_package(GnomeVFS2) + if(GNOMEVFS2_FOUND) + list(APPEND INKSCAPE_INCS_SYS ${GNOMEVFS2_INCLUDE_DIR}) + list(APPEND INKSCAPE_LIBS ${GNOMEVFS-2_LIBRARY}) + else() + set(WITH_GNOME_VFS OFF) + endif() endif() if(ENABLE_LCMS) - find_package(LCMS2) - if(LCMS2_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${LCMS2_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LCMS2_LIBRARIES}) - add_definitions(${LCMS2_DEFINITIONS}) + 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) - else() + else() find_package(LCMS) if(LCMS_FOUND) list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS}) @@ -94,31 +94,31 @@ list(APPEND INKSCAPE_LIBS ${BOEHMGC_LIBRARIES}) add_definitions(${BOEHMGC_DEFINITIONS}) if(ENABLE_POPPLER) - find_package(PopplerCairo) - if(POPPLER_FOUND) - set(HAVE_POPPLER ON) - if(ENABLE_POPPLER_CAIRO) - if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) - set(HAVE_POPPLER_CAIRO ON) - endif() - if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) - set(HAVE_POPPLER_GLIB ON) - endif() - endif() - if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR - POPPLER_VERSION VERSION_EQUAL "0.26.0") - set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON) - endif() - if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR - POPPLER_VERSION VERSION_EQUAL "0.29.0") - set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) - endif() - else() - set(ENABLE_POPPLER_CAIRO OFF) + find_package(PopplerCairo) + if(POPPLER_FOUND) + set(HAVE_POPPLER ON) + if(ENABLE_POPPLER_CAIRO) + if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) + set(HAVE_POPPLER_CAIRO ON) + endif() + if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) + set(HAVE_POPPLER_GLIB ON) + endif() endif() -else() - set(HAVE_POPPLER OFF) + if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR + POPPLER_VERSION VERSION_EQUAL "0.26.0") + set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON) + endif() + if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR + POPPLER_VERSION VERSION_EQUAL "0.29.0") + set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) + endif() + else() set(ENABLE_POPPLER_CAIRO OFF) + endif() +else() + set(HAVE_POPPLER OFF) + set(ENABLE_POPPLER_CAIRO OFF) endif() list(APPEND INKSCAPE_INCS_SYS ${POPPLER_INCLUDE_DIRS}) @@ -126,50 +126,50 @@ list(APPEND INKSCAPE_LIBS ${POPPLER_LIBRARIES}) add_definitions(${POPPLER_DEFINITIONS}) if(WITH_LIBWPG) - find_package(LibWPG) - if(LIBWPG_FOUND) - set(WITH_LIBWPG01 ${LIBWPG-0.1_FOUND}) - set(WITH_LIBWPG02 ${LIBWPG-0.2_FOUND}) - set(WITH_LIBWPG03 ${LIBWPG-0.3_FOUND}) - list(APPEND INKSCAPE_INCS_SYS ${LIBWPG_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LIBWPG_LIBRARIES}) - add_definitions(${LIBWPG_DEFINITIONS}) - else() - set(WITH_LIBWPG OFF) - endif() + find_package(LibWPG) + if(LIBWPG_FOUND) + set(WITH_LIBWPG01 ${LIBWPG-0.1_FOUND}) + set(WITH_LIBWPG02 ${LIBWPG-0.2_FOUND}) + set(WITH_LIBWPG03 ${LIBWPG-0.3_FOUND}) + list(APPEND INKSCAPE_INCS_SYS ${LIBWPG_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${LIBWPG_LIBRARIES}) + add_definitions(${LIBWPG_DEFINITIONS}) + else() + set(WITH_LIBWPG OFF) + endif() endif() if(WITH_LIBVISIO) - find_package(LibVisio) - if(LIBVISIO_FOUND) - set(WITH_LIBVISIO00 ${LIBVISIO-0.0_FOUND}) - set(WITH_LIBVISIO01 ${LIBVISIO-0.1_FOUND}) - list(APPEND INKSCAPE_INCS_SYS ${LIBVISIO_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LIBVISIO_LIBRARIES}) - add_definitions(${LIBVISIO_DEFINITIONS}) - else() - set(WITH_LIBVISIO OFF) - endif() + find_package(LibVisio) + if(LIBVISIO_FOUND) + set(WITH_LIBVISIO00 ${LIBVISIO-0.0_FOUND}) + set(WITH_LIBVISIO01 ${LIBVISIO-0.1_FOUND}) + list(APPEND INKSCAPE_INCS_SYS ${LIBVISIO_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${LIBVISIO_LIBRARIES}) + add_definitions(${LIBVISIO_DEFINITIONS}) + else() + set(WITH_LIBVISIO OFF) + endif() endif() if(WITH_LIBCDR) - find_package(LibCDR) - if(LIBCDR_FOUND) - set(WITH_LIBCDR00 ${LIBCDR-0.0_FOUND}) - set(WITH_LIBCDR01 ${LIBCDR-0.1_FOUND}) - list(APPEND INKSCAPE_INCS_SYS ${LIBCDR_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LIBCDR_LIBRARIES}) - add_definitions(${LIBCDR_DEFINITIONS}) - else() - set(WITH_LIBCDR OFF) - endif() + find_package(LibCDR) + if(LIBCDR_FOUND) + set(WITH_LIBCDR00 ${LIBCDR-0.0_FOUND}) + set(WITH_LIBCDR01 ${LIBCDR-0.1_FOUND}) + list(APPEND INKSCAPE_INCS_SYS ${LIBCDR_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${LIBCDR_LIBRARIES}) + add_definitions(${LIBCDR_DEFINITIONS}) + else() + set(WITH_LIBCDR OFF) + endif() endif() FIND_PACKAGE(JPEG) IF(JPEG_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${JPEG_INCLUDE_DIR}) - list(APPEND INKSCAPE_LIBS ${JPEG_LIBRARIES}) - set(HAVE_JPEG ON) + list(APPEND INKSCAPE_INCS_SYS ${JPEG_INCLUDE_DIR}) + list(APPEND INKSCAPE_LIBS ${JPEG_LIBRARIES}) + set(HAVE_JPEG ON) ENDIF() find_package(PNG REQUIRED) @@ -183,42 +183,42 @@ add_definitions(${POPT_DEFINITIONS}) 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) + list(APPEND INKSCAPE_INCS_SYS ${POTRACE_INCLUDE_DIRS}) + 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") + 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) - find_package(DBus REQUIRED) - if(DBUS_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIR}) - list(APPEND INKSCAPE_INCS_SYS ${DBUS_ARCH_INCLUDE_DIR}) - list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES}) - else() - set(WITH_DBUS OFF) - endif() + find_package(DBus REQUIRED) + if(DBUS_FOUND) + list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIR}) + list(APPEND INKSCAPE_INCS_SYS ${DBUS_ARCH_INCLUDE_DIR}) + list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES}) + else() + set(WITH_DBUS OFF) + endif() endif() if(WITH_GTEST) - if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") + if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") - else() - set(WITH_GTEST off) - endif() + else() + set(WITH_GTEST off) + endif() endif() # ---------------------------------------------------------------------------- # CMake's builtin # ---------------------------------------------------------------------------- -SET (TRY_GTKSPELL 1) +set(TRY_GTKSPELL 1) # Include dependencies: # use patched version until GTK2_CAIROMMCONFIG_INCLUDE_DIR is added -IF ("${WITH_GTK3_EXPERIMENTAL}") +if("${WITH_GTK3_EXPERIMENTAL}") pkg_check_modules( GTK REQUIRED @@ -229,36 +229,36 @@ IF ("${WITH_GTK3_EXPERIMENTAL}") gdl-3.0>=3.3.5 ) message("Using EXPERIMENTAL Gtkmm 3 build") - SET (WITH_GTKMM_3_0 1) + set(WITH_GTKMM_3_0 1) message("Using external GDL") - SET(WITH_EXT_GDL 1) + 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, - ) + # 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}") + if("${GTKMM_3_10_FOUND}") message("Using Gtkmm 3.10 build") - SET (WITH_GTKMM_3_10 1) - ENDIF() + set (WITH_GTKMM_3_10 1) + endif() pkg_check_modules(GDL_3_6 gdl-3.0>=3.6) - IF ("${GDL_3_6_FOUND}") + if("${GDL_3_6_FOUND}") message("Using Gdl 3.6 or higher") - SET (WITH_GDL_3_6 1) - ENDIF() + set (WITH_GDL_3_6 1) + endif() - SET (TRY_GTKSPELL ) + set(TRY_GTKSPELL ) pkg_check_modules(GTKSPELL3 gtkspell3-3.0) - IF ("${GTKSPELL3_FOUND}") + if("${GTKSPELL3_FOUND}") message("Using GtkSpell3 3.0") - SET (WITH_GTKSPELL 1) - ENDIF() + set (WITH_GTKSPELL 1) + endif() list(APPEND INKSCAPE_INCS_SYS ${GTK_INCLUDE_DIRS} ${GTKSPELL3_INCLUDE_DIRS} @@ -268,7 +268,7 @@ IF ("${WITH_GTK3_EXPERIMENTAL}") ${GTK_LIBRARIES} ${GTKSPELL3_LIBRARIES} ) -ELSE() +else() find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${GTK2_GDK_INCLUDE_DIR} @@ -295,7 +295,7 @@ ELSE() ${GTK2_GIOMMCONFIG_INCLUDE_DIR} ${GTK2_SIGC++_INCLUDE_DIR} ${GTK2_SIGC++CONFIG_INCLUDE_DIR} - ) + ) list(APPEND INKSCAPE_LIBS ${GTK2_GDK_LIBRARY} @@ -314,8 +314,8 @@ ELSE() ${GTK2_GIOMM_LIBRARY} ${GTK2_SIGC++_LIBRARY} ${GTK2_GOBJECT_LIBRARY} - ) -ENDIF() + ) +endif() find_package(Freetype REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS}) @@ -327,21 +327,21 @@ list(APPEND INKSCAPE_INCS_SYS ${Boost_INCLUDE_DIRS}) find_package(ASPELL) if(ASPELL_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${ASPELL_INCLUDE_DIR}) - list(APPEND INKSCAPE_LIBS ${ASPELL_LIBRARIES}) - add_definitions(${ASPELL_DEFINITIONS}) - set(HAVE_ASPELL TRUE) + list(APPEND INKSCAPE_INCS_SYS ${ASPELL_INCLUDE_DIR}) + list(APPEND INKSCAPE_LIBS ${ASPELL_LIBRARIES}) + add_definitions(${ASPELL_DEFINITIONS}) + set(HAVE_ASPELL TRUE) endif() if("${TRY_GTKSPELL}" AND "${WITH_GTKSPELL}") - find_package(GtkSpell) - if(GTKSPELL_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${GTKSPELL_INCLUDE_DIR}) - list(APPEND INKSCAPE_LIBS ${GTKSPELL_LIBRARIES}) - add_definitions(${GTKSPELL_DEFINITIONS}) - else() - set(WITH_GTKSPELL OFF) - endif() + find_package(GtkSpell) + if(GTKSPELL_FOUND) + list(APPEND INKSCAPE_INCS_SYS ${GTKSPELL_INCLUDE_DIR}) + list(APPEND INKSCAPE_LIBS ${GTKSPELL_LIBRARIES}) + add_definitions(${GTKSPELL_DEFINITIONS}) + else() + set(WITH_GTKSPELL OFF) + endif() endif() #find_package(OpenSSL) @@ -359,23 +359,23 @@ list(APPEND INKSCAPE_LIBS ${LIBXML2_LIBRARIES}) add_definitions(${LIBXML2_DEFINITIONS}) if(WITH_OPENMP) - find_package(OpenMP) - if(OPENMP_FOUND) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - if(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode") - set(CMAKE_XCODE_ATTRIBUTE_ENABLE_OPENMP_SUPPORT "YES") - endif() - mark_as_advanced(OpenMP_C_FLAGS) - mark_as_advanced(OpenMP_CXX_FLAGS) - # '-fopenmp' is in OpenMP_C_FLAGS, OpenMP_CXX_FLAGS and implies '-lgomp' - # uncomment explicit linking below if still needed: - set(HAVE_OPENMP ON) - #list(APPEND INKSCAPE_LIBS "-lgomp") # FIXME - else() - set(HAVE_OPENMP OFF) - set(WITH_OPENMP OFF) + find_package(OpenMP) + if(OPENMP_FOUND) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + if(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode") + set(CMAKE_XCODE_ATTRIBUTE_ENABLE_OPENMP_SUPPORT "YES") endif() + mark_as_advanced(OpenMP_C_FLAGS) + mark_as_advanced(OpenMP_CXX_FLAGS) + # '-fopenmp' is in OpenMP_C_FLAGS, OpenMP_CXX_FLAGS and implies '-lgomp' + # uncomment explicit linking below if still needed: + set(HAVE_OPENMP ON) + #list(APPEND INKSCAPE_LIBS "-lgomp") # FIXME + else() + set(HAVE_OPENMP OFF) + set(WITH_OPENMP OFF) + endif() endif() find_package(ZLIB REQUIRED) @@ -383,34 +383,34 @@ list(APPEND INKSCAPE_INCS_SYS ${ZLIB_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) if(WITH_IMAGE_MAGICK) - find_package(ImageMagick COMPONENTS MagickCore Magick++) - if(ImageMagick_FOUND) - # the component-specific paths apparently fail to get detected correctly - # on some linux distros (or with older Cmake versions). - # Use variables which list all include dirs and libraries instead: - list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) - # TODO: Cmake's ImageMagick module misses required defines for newer - # versions of ImageMagick. See also: - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776832 - #add_definitions(-DMAGICKCORE_HDRI_ENABLE=0) # FIXME (version check?) - #add_definitions(-DMAGICKCORE_QUANTUM_DEPTH=16) # FIXME (version check?) - else() - set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' - endif() + find_package(ImageMagick COMPONENTS MagickCore Magick++) + if(ImageMagick_FOUND) + # the component-specific paths apparently fail to get detected correctly + # on some linux distros (or with older Cmake versions). + # Use variables which list all include dirs and libraries instead: + list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) + # TODO: Cmake's ImageMagick module misses required defines for newer + # versions of ImageMagick. See also: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776832 + #add_definitions(-DMAGICKCORE_HDRI_ENABLE=0) # FIXME (version check?) + #add_definitions(-DMAGICKCORE_QUANTUM_DEPTH=16) # FIXME (version check?) + else() + set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' + endif() 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) + 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) -- cgit v1.2.3 From 1d0e982975cc5438362b3cde1b2fd5e628ed235f Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Tue, 19 Jan 2016 15:13:36 -0800 Subject: cmake: Drop Java support (IIRC java was used for the built-in scripts dialog, along with the linked python and perl libs) (bzr r14609) --- CMakeScripts/DefineDependsandFlags.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index f29b98a1f..59c2cb063 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -400,8 +400,6 @@ if(WITH_IMAGE_MAGICK) endif() endif() -include(${CMAKE_CURRENT_LIST_DIR}/IncludeJava.cmake) - set(ENABLE_NLS OFF) if(WITH_NLS) find_package(Gettext) -- cgit v1.2.3 From 53a4d10251bb079fa22ced4dcbb381f42f56ceb1 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 27 Feb 2016 01:25:50 -0800 Subject: cmake: Add sigc++ support Patch from rindolf Signed-off-by: Bryce Harrington (bzr r14669) --- CMakeScripts/DefineDependsandFlags.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 59c2cb063..ab197a7af 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -411,6 +411,7 @@ if(WITH_NLS) endif(GETTEXT_FOUND) endif(WITH_NLS) +find_package(SigC++ REQUIRED) # end Dependencies -- cgit v1.2.3