From b0e9403d48c4c7a21ae8d7e2eaf26d712a835556 Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Mon, 25 Oct 2010 18:23:03 -0300 Subject: Updated PySide cmake files to use Python library information from Shiboken. Shiboken cmake files provides information about which Python library to link against through cmake SHIBOKEN_PYTHON_LIBRARIES variable. It also sets the Py_DEBUG flag if necessary. Reviewed by Lauro Moura Reviewed by Renato Araujo --- PySide/QtCore/CMakeLists.txt | 2 +- PySide/QtDeclarative/CMakeLists.txt | 2 +- PySide/QtGui/CMakeLists.txt | 2 +- PySide/QtHelp/CMakeLists.txt | 2 +- PySide/QtMaemo5/CMakeLists.txt | 2 +- PySide/QtMultimedia/CMakeLists.txt | 2 +- PySide/QtNetwork/CMakeLists.txt | 2 +- PySide/QtOpenGL/CMakeLists.txt | 2 +- PySide/QtScript/CMakeLists.txt | 2 +- PySide/QtScriptTools/CMakeLists.txt | 2 +- PySide/QtSql/CMakeLists.txt | 2 +- PySide/QtSvg/CMakeLists.txt | 2 +- PySide/QtTest/CMakeLists.txt | 2 +- PySide/QtUiTools/CMakeLists.txt | 2 +- PySide/QtWebKit/CMakeLists.txt | 2 +- PySide/QtXml/CMakeLists.txt | 2 +- PySide/QtXmlPatterns/CMakeLists.txt | 2 +- PySide/phonon/CMakeLists.txt | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) (limited to 'PySide') diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt index 554cefbae..cbc3519f3 100644 --- a/PySide/QtCore/CMakeLists.txt +++ b/PySide/QtCore/CMakeLists.txt @@ -145,7 +145,7 @@ set(QtCore_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${libpyside_SOURCE_DIR} ${PYTHON_INCLUDE_PATH}) set(QtCore_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} ${QT_QTCORE_LIBRARY}) diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt index 1966cab32..21090df9f 100644 --- a/PySide/QtDeclarative/CMakeLists.txt +++ b/PySide/QtDeclarative/CMakeLists.txt @@ -37,7 +37,7 @@ set(QtDeclarative_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative) set(QtDeclarative_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index 85c61b9b2..ae0c0b918 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -410,7 +410,7 @@ set(QtGui_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_PATH} ${QtCore_BINARY_DIR}/PySide/QtCore/) set(QtGui_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} ${QT_QTGUI_LIBRARY}) set(QtGui_deps "QtCore") diff --git a/PySide/QtHelp/CMakeLists.txt b/PySide/QtHelp/CMakeLists.txt index 1f7a3cdbb..f3371630d 100644 --- a/PySide/QtHelp/CMakeLists.txt +++ b/PySide/QtHelp/CMakeLists.txt @@ -27,7 +27,7 @@ set(QtHelp_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp) set(QtHelp_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTHELP_LIBRARY}) diff --git a/PySide/QtMaemo5/CMakeLists.txt b/PySide/QtMaemo5/CMakeLists.txt index 1d4b296d3..7222db055 100644 --- a/PySide/QtMaemo5/CMakeLists.txt +++ b/PySide/QtMaemo5/CMakeLists.txt @@ -34,7 +34,7 @@ set(QtMaemo5_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtGui_BINARY_DIR}/${BINDING_NAME}/QtGui/ ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5) set(QtMaemo5_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTMAEMO5_LIBRARY}) diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt index 7db481ed7..5b20fd930 100644 --- a/PySide/QtMultimedia/CMakeLists.txt +++ b/PySide/QtMultimedia/CMakeLists.txt @@ -32,7 +32,7 @@ set(QtMultimedia_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtGui_BINARY_DIR}/PySide/QtGui/) set(QtMultimedia_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} ${QT_QTMULTIMEDIA_LIBRARY} ${QT_QTGUI_LIBRARY}) diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt index faf5a1ddd..40d114d32 100644 --- a/PySide/QtNetwork/CMakeLists.txt +++ b/PySide/QtNetwork/CMakeLists.txt @@ -60,7 +60,7 @@ set(QtNetwork_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_PATH} ${QtCore_BINARY_DIR}/PySide/QtCore/) set(QtNetwork_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} ${QT_QTNETWORK_LIBRARY}) diff --git a/PySide/QtOpenGL/CMakeLists.txt b/PySide/QtOpenGL/CMakeLists.txt index 8e72a6a9e..16e693796 100644 --- a/PySide/QtOpenGL/CMakeLists.txt +++ b/PySide/QtOpenGL/CMakeLists.txt @@ -44,7 +44,7 @@ set(QtOpenGL_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL) set(QtOpenGL_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY}) diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt index af3876840..4bac4ebe3 100644 --- a/PySide/QtScript/CMakeLists.txt +++ b/PySide/QtScript/CMakeLists.txt @@ -35,7 +35,7 @@ set(QtScript_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_PATH} ${QtCore_BINARY_DIR}/PySide/QtCore ) set(QtScript_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTSCRIPT_LIBRARY}) diff --git a/PySide/QtScriptTools/CMakeLists.txt b/PySide/QtScriptTools/CMakeLists.txt index 246cb922a..a2e059f29 100644 --- a/PySide/QtScriptTools/CMakeLists.txt +++ b/PySide/QtScriptTools/CMakeLists.txt @@ -21,7 +21,7 @@ set(QtScriptTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools) set(QtScriptTools_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_GUI_LIBRARY} ${QT_QTSCRIPT_LIBRARY} diff --git a/PySide/QtSql/CMakeLists.txt b/PySide/QtSql/CMakeLists.txt index c5777dde3..40caafb29 100644 --- a/PySide/QtSql/CMakeLists.txt +++ b/PySide/QtSql/CMakeLists.txt @@ -33,7 +33,7 @@ set(QtSql_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtGui_BINARY_DIR}/PySide/QtGui/ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/) set(QtSql_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY}) diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt index 0c31dbfaa..f5159d3e8 100644 --- a/PySide/QtSvg/CMakeLists.txt +++ b/PySide/QtSvg/CMakeLists.txt @@ -21,7 +21,7 @@ set(QtSvg_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${QtGui_BINARY_DIR}/PySide/QtGui/) set(QtSvg_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTGUI_LIBRARY}) diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt index 064e9a800..696adc807 100644 --- a/PySide/QtTest/CMakeLists.txt +++ b/PySide/QtTest/CMakeLists.txt @@ -18,7 +18,7 @@ set(QtTest_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${QtGui_BINARY_DIR}/PySide/QtGui/) set(QtTest_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt index 4054ffc9b..fd26ed509 100644 --- a/PySide/QtUiTools/CMakeLists.txt +++ b/PySide/QtUiTools/CMakeLists.txt @@ -22,7 +22,7 @@ set(QtUiTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools) set(QtUiTools_libraries pyside uiplugin - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt index d23fa3e58..8b6e040d4 100644 --- a/PySide/QtWebKit/CMakeLists.txt +++ b/PySide/QtWebKit/CMakeLists.txt @@ -46,7 +46,7 @@ set(QtWebkit_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtGui_BINARY_DIR}/PySide/QtGui/ ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/ ) set(QtWebKit_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTNETWORK_LIBRARY} diff --git a/PySide/QtXml/CMakeLists.txt b/PySide/QtXml/CMakeLists.txt index f461a939c..a801102ee 100644 --- a/PySide/QtXml/CMakeLists.txt +++ b/PySide/QtXml/CMakeLists.txt @@ -47,7 +47,7 @@ set(QtXml_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_PATH} ${QtCore_BINARY_DIR}/PySide/QtCore) set(QtXml_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} ${QT_QTXML_LIBRARY}) set(QtXml_deps QtCore) diff --git a/PySide/QtXmlPatterns/CMakeLists.txt b/PySide/QtXmlPatterns/CMakeLists.txt index 6c112133f..eeca1848a 100644 --- a/PySide/QtXmlPatterns/CMakeLists.txt +++ b/PySide/QtXmlPatterns/CMakeLists.txt @@ -36,7 +36,7 @@ set(QtXmlPatterns_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns) set(QtXmlPatterns_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTXMLPATTERNS_LIBRARY}) set(QtXmlPatterns_deps QtCore) diff --git a/PySide/phonon/CMakeLists.txt b/PySide/phonon/CMakeLists.txt index 198ed6e25..183d8fe3f 100644 --- a/PySide/phonon/CMakeLists.txt +++ b/PySide/phonon/CMakeLists.txt @@ -58,7 +58,7 @@ set(phonon_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon) set(phonon_libraries pyside - ${PYSIDE_PYTHON_LIBRARIES} + ${SHIBOKEN_PYTHON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_PHONON_LIBRARY}) -- cgit v1.2.3