diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2015-11-09 00:03:27 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2015-11-09 00:03:27 +0000 |
| commit | 6484d2580d5facccf1b4bd7719c5d26fb8d07602 (patch) | |
| tree | eeed81ef6bfeabf01df264335e5f2bf3ce706762 | |
| parent | Update Potrace bitmap macros to upstream 1.13 (diff) | |
| download | inkscape-6484d2580d5facccf1b4bd7719c5d26fb8d07602.tar.gz inkscape-6484d2580d5facccf1b4bd7719c5d26fb8d07602.zip | |
Add CMake check for Potrace from OSP: http://goo.gl/AEzbkQ
Fixed bugs:
- https://launchpad.net/bugs/1156664
(bzr r14449.1.3)
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 4 | ||||
| -rw-r--r-- | CMakeScripts/Modules/FindPotrace.cmake | 36 | ||||
| -rw-r--r-- | src/trace/CMakeLists.txt | 17 |
3 files changed, 40 insertions, 17 deletions
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) diff --git a/CMakeScripts/Modules/FindPotrace.cmake b/CMakeScripts/Modules/FindPotrace.cmake new file mode 100644 index 000000000..a542394fe --- /dev/null +++ b/CMakeScripts/Modules/FindPotrace.cmake @@ -0,0 +1,36 @@ +# POTRACE_FOUND - system has Potrace +# POTRACE_INCLUDE_DIR - the Potrace include directory +# POTRACE_LIBRARIES - The libraries needed to use Potrace + +FIND_PATH(POTRACE_INCLUDE_DIR potracelib.h + /usr/include + /usr/local/include +) + +FIND_LIBRARY(POTRACE_LIBRARY NAMES potrace libpotrace + PATHS + /usr/lib + /usr/local/lib +) + +if (POTRACE_INCLUDE_DIR AND POTRACE_LIBRARY) + set(POTRACE_FOUND TRUE) + set(POTRACE_LIBRARIES ${POTRACE_LIBRARY}) +else (POTRACE_INCLUDE_DIR AND POTRACE_LIBRARY) + set(POTRACE_FOUND FALSE) +endif (POTRACE_INCLUDE_DIR AND POTRACE_LIBRARY) + +if (POTRACE_FOUND) + if (NOT Potrace_FIND_QUIETLY) + message(STATUS "Found potrace: ${POTRACE_LIBRARIES}") + endif (NOT Potrace_FIND_QUIETLY) +else (POTRACE_FOUND) + if (NOT Potrace_FIND_QUIETLY) + + message(STATUS "don't find potrace") + + endif (NOT Potrace_FIND_QUIETLY) +endif (POTRACE_FOUND) + +MARK_AS_ADVANCED(POTRACE_INCLUDE_DIR POTRACE_LIBRARIES POTRACE_LIBRARY) + diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt index bf7cfa276..776d96158 100644 --- a/src/trace/CMakeLists.txt +++ b/src/trace/CMakeLists.txt @@ -7,14 +7,7 @@ set(trace_SRC siox.cpp trace.cpp - potrace/curve.cpp - potrace/decompose.cpp - potrace/greymap.cpp potrace/inkscape-potrace.cpp - potrace/potracelib.cpp - potrace/render.cpp - potrace/trace.cpp - # ------- # Headers @@ -26,18 +19,8 @@ set(trace_SRC siox.h trace.h - potrace/auxiliary.h potrace/bitmap.h - potrace/bitops.h - potrace/curve.h - potrace/decompose.h - potrace/greymap.h potrace/inkscape-potrace.h - potrace/lists.h - potrace/potracelib.h - potrace/progress.h - potrace/render.h - potrace/trace.h ) # add_inkscape_lib(trace_LIB "${trace_SRC}") |