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

« back to all changes in this revision

Viewing changes to PySide/QtScript/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:
32
32
                            ${QT_QTSCRIPT_INCLUDE_DIR}
33
33
                            ${SHIBOKEN_INCLUDE_DIR}
34
34
                            ${libpyside_SOURCE_DIR}
35
 
                            ${PYTHON_INCLUDE_PATH}
 
35
                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
36
36
                            ${QtCore_BINARY_DIR}/PySide/QtCore )
37
37
set(QtScript_libraries      pyside
38
 
                            ${PYSIDE_PYTHON_LIBRARIES}
 
38
                            ${SHIBOKEN_PYTHON_LIBRARIES}
39
39
                            ${SHIBOKEN_LIBRARY}
40
40
                            ${QT_QTCORE_LIBRARY}
41
41
                            ${QT_QTSCRIPT_LIBRARY})
45
45
                     QtScript_libraries
46
46
                     QtScript_deps
47
47
                     QtScript_typesystem_path
48
 
                     QtScript_SRC
49
 
                     "")
 
48
                     QtScript_SRC)