lp:~shlomif-gmail/inkscape/inkscape

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~inkscape.dev/inkscape/trunk

Inkscape Developers: Pending requested 2014-04-24

Diff: 170 lines (+80/-15)

5 files modified

CMakeLists.txt (+0/-6)
CMakeScripts/DefineDependsandFlags.cmake (+21/-7)
CMakeScripts/Modules/FindLCMS2.cmake (+38/-0)
config.h.cmake (+11/-1)
src/CMakeLists.txt (+10/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

13309. By Shlomi Fish on 2014-11-03

cmake fixes.

13308. By Shlomi Fish on 2014-10-25

Foo.

13307. By Shlomi Fish on 2014-10-10

Merged.

13306. By Shlomi Fish on 2014-10-08

Foo.

13305. By Shlomi Fish on 2014-09-23

Committed/merged.

13304. By Shlomi Fish on 2014-04-25

Merged.

13303. By Shlomi Fish on 2014-04-24

Fix for Poppler in CMake.

13302. By Shlomi Fish on 2014-04-24

Fix the LCMS handling by the CMake build system.

Added FindLCMS2.cmake from openjpeg.

This problem prevented running the following command:

cmake -G Ninja -DCMAKE_BUILD_TYPE=DebugFull -DENABLE_LCMS=ON -DENABLE_POPPLER=OFF -DCMAKE_INSTALL_PREFIX=/home/shlomif/apps/graphics/inkscape-trunk -DCMAKE_CXX_FLAGS=-fpermissive ../inkscape/

13301. By Tavmjong Bah on 2014-04-24

Clean up of style code: refactor marker properties. Step 3.

13300. By Tavmjong Bah on 2014-04-24

Clean up of style code, removal of SPFontStyle. Step 2.