inkscape:yai-alpha_yai-alpha

Last commit made on 2015-07-09
Get this branch:
git clone -b yai-alpha_yai-alpha https://git.launchpad.net/inkscape

Branch merges

Branch information

Name:
yai-alpha_yai-alpha
Repository:
lp:inkscape

Recent commits

2d8ed95... by yai <email address hidden>

Fix typo in pybind/CMakeLists.txt

(bzr r14214)

766b1ac... by yai <email address hidden>

Remove one more debugging comment.

(bzr r14213)

d49bf1f... by yai <email address hidden>

Replace hard coded cython binary with found ones.

(bzr r14212)

7eec39c... by yai <email address hidden>

Cleanup. Remove some debugging messages. Add back message when library or include isn't found. Made add_subdirectory(pybind) optional. Now -DWITH_PYTHON=n should work properly.

(bzr r14211)

e194f31... by yai <email address hidden>

Add cython pybInkscape.cpp generation to cmake build scripts
- Undo changes to CMakeScript/HelperMacro.cmake and create a new function there instead.
- Make pybind_LIB optional.
- Add missing S from PYGTK_INCLUDE_DIRS (the last version worked because of a fluke).
- Add cython generation
- Delete generated src/pybind/pybInkscape.cpp

(bzr r14210)

8c4c53c... by yai <email address hidden>

Stashing temporary changes.

(bzr r14209)

e58c629... by yai <email address hidden>

Adding forgotten pregenerated pybInkscape.cpp from the last commit.

(bzr r14208)

60b7680... by yai <email address hidden>

First working version using cmake. This version uses a pregenerated pybInkscape.cpp. Changes
- Added default FindPythonLibs.cmake from cmake and its dependencies
- Changed INKSCAPE_PKG_CONFIG_FIND in CMakeScripts/HelperMacros.cmake to accept a value for LIB_NAME that evaluates to false. In that case, only set include dirs.
- Added a message for packages not found in INKSCAPE_PKG_CONFIG_FIND

(bzr r14207)

bacc5aa... by yai <email address hidden>

Merge in trunk changes upto 14198 before making other changes to cmake files.

(bzr r14206)

2029c2d... by yai <email address hidden>

Make python bindings actually optional with --with-python and --without-python as configure flags.

(bzr r14205)