cmake merge

2013-05-06 Thread Jonathan Riddell
* Merge with Debian, remaining changes: - Add ubuntu_qt_import_dir_variable.diff define QT_IMPORTS_DIR even when that dir does not exist. - Add multiarch-python-include-dirs.patch * Fix FindPythonLibs to specify both include paths to Python.h pyconfig.h in PYTHON_INCLUDE_DIRS.

Re: cmake merge

2013-05-06 Thread Scott Kitterman
Jonathan Riddell jridd...@ubuntu.com wrote: * Merge with Debian, remaining changes: - Add ubuntu_qt_import_dir_variable.diff define QT_IMPORTS_DIR even when that dir does not exist. - Add multiarch-python-include-dirs.patch * Fix FindPythonLibs to specify both include paths to