diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 01:57:40 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 01:57:40 +0000 |
| commit | 8c69598809f03d7de4bb63ee4cf2d2f785647841 (patch) | |
| tree | bd807b2b4802fdd513e8b0a5daecb61b45e2d964 /CMakeScripts/DefineDependsandFlags.cmake | |
| parent | working on knots selection (diff) | |
| parent | Add Mac CI build config (diff) | |
| download | inkscape-8c69598809f03d7de4bb63ee4cf2d2f785647841.tar.gz inkscape-8c69598809f03d7de4bb63ee4cf2d2f785647841.zip | |
Merge https://gitlab.com/inkscape/inkscape into selectable-knots
Diffstat (limited to 'CMakeScripts/DefineDependsandFlags.cmake')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index a98ebcf2b..0a8782f27 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -67,6 +67,11 @@ if(WITH_GNOME_VFS) endif() endif() +find_package(JeMalloc) +if (JEMALLOC_FOUND) + list(APPEND INKSCAPE_LIBS ${JEMALLOC_LIBRARIES}) +endif() + if(ENABLE_LCMS) unset(HAVE_LIBLCMS1) unset(HAVE_LIBLCMS2) @@ -373,7 +378,7 @@ list(APPEND INKSCAPE_INCS_SYS ${ZLIB_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) if(WITH_IMAGE_MAGICK) - pkg_check_modules(ImageMagick ImageMagick MagickCore Magick++ ) + pkg_check_modules(ImageMagick ImageMagick++ ) if(ImageMagick_FOUND) list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS}) |