← Back to branch summary

~ubuntu-branches/ubuntu/natty/pyside/natty-proposed

« back to all changes in this revision

Viewing changes to PySide/QtUiTools/CMakeLists.txt

  • Committer: Bazaar Package Importer
  • Author(s): Didier Raboud
  • Date: 2011-02-18 18:01:00 UTC
  • mfrom: (1.2.3 upstream) (6.1.6 experimental)
  • Revision ID: james.westby@ubuntu.com-20110218180100-vaczjij7g08fzfme
Tags: 1.0.0~rc1-1
* New 1.0.0~rc1 upstream release
  - Bump the B-D chain versions:
    + apiextractor to 0.10.0-2~
    + generatorrunner to 0.6.6
    + shiboken to 1.0.0~rc1
* Update patches to ~rc1.
* debian/watch: update to handle Release Candidates too.
* Bump XS-Python-Version to >= 2.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
PySide/QtUiTools/CMakeLists.txt
12
12
                            ${QT_QTXML_INCLUDE_DIR}
13
13
                            ${QT_QTDESIGNER_INCLUDE_DIR}
14
14
                            ${QT_QTUITOOLS_INCLUDE_DIR}
15
 
                            ${PYTHON_INCLUDE_PATH}
 
15
                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
16
16
                            ${SHIBOKEN_INCLUDE_DIR}
17
17
                            ${libpyside_SOURCE_DIR}
18
18
                            ${plugins_SOURCE_DIR}
22
22
                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools)
23
23
set(QtUiTools_libraries     pyside
24
24
                            uiplugin
25
 
                            ${PYSIDE_PYTHON_LIBRARIES}
 
25
                            ${SHIBOKEN_PYTHON_LIBRARIES}
26
26
                            ${QT_QTCORE_LIBRARY}
27
27
                            ${QT_QTGUI_LIBRARY}
28
28
                            ${QT_QTDESIGNER_LIBRARY}
33
33
                     QtUiTools_libraries
34
34
                     QtUiTools_deps
35
35
                     QtUiTools_typesystem_path
36
 
                     QtUiTools_SRC
37
 
                     "")
 
36
                     QtUiTools_SRC)
38
37