diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-10-28 15:35:38 -0200 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-10-28 15:48:28 -0200 |
commit | 42e83525db3da45b38b097825c736b2c733e9cf2 (patch) | |
tree | 4d103a8dea62c615453afd2e08f5c91429e20df6 | |
parent | 07b25e96864209358991682e4e26bea4c89e4f96 (diff) | |
download | pyside-42e83525db3da45b38b097825c736b2c733e9cf2.tar.gz pyside-42e83525db3da45b38b097825c736b2c733e9cf2.tar.xz pyside-42e83525db3da45b38b097825c736b2c733e9cf2.zip |
Fix bug#438 - "Can't find Python.h on OS X"
Reviewer: Renato Araújo <renato.filho@openbossa.org>
Lauro Moura <lauro.neto@openbossa.org>
-rw-r--r-- | PySide/QtCore/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtDeclarative/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtGui/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtHelp/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtMaemo5/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtMultimedia/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtNetwork/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtOpenGL/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtScript/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtScriptTools/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtSql/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtSvg/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtTest/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtUiTools/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtWebKit/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtXml/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/QtXmlPatterns/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide/phonon/CMakeLists.txt | 2 |
18 files changed, 18 insertions, 18 deletions
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt index cbc3519..056597c 100644 --- a/PySide/QtCore/CMakeLists.txt +++ b/PySide/QtCore/CMakeLists.txt @@ -143,7 +143,7 @@ set(QtCore_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH}) + ${SHIBOKEN_PYTHON_INCLUDE_DIR}) set(QtCore_libraries pyside ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt index 21090df..1788adc 100644 --- a/PySide/QtDeclarative/CMakeLists.txt +++ b/PySide/QtDeclarative/CMakeLists.txt @@ -28,7 +28,7 @@ set(QtDeclarative_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTNETWORK_INCLUDE_DIR} ${QT_QTDECLARATIVE_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${QtGui_BINARY_DIR}/PySide/QtGui/ diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index ae0c0b9..7178e60 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -407,7 +407,7 @@ set(QtGui_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/) set(QtGui_libraries pyside ${SHIBOKEN_PYTHON_LIBRARIES} diff --git a/PySide/QtHelp/CMakeLists.txt b/PySide/QtHelp/CMakeLists.txt index f337163..0ca0272 100644 --- a/PySide/QtHelp/CMakeLists.txt +++ b/PySide/QtHelp/CMakeLists.txt @@ -20,7 +20,7 @@ set(QtHelp_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTHELP_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${QtGui_BINARY_DIR}/PySide/QtGui/ diff --git a/PySide/QtMaemo5/CMakeLists.txt b/PySide/QtMaemo5/CMakeLists.txt index 7222db0..fadf91d 100644 --- a/PySide/QtMaemo5/CMakeLists.txt +++ b/PySide/QtMaemo5/CMakeLists.txt @@ -27,7 +27,7 @@ set(QtMaemo5_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTMAEMO5_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${QtCore_BINARY_DIR}/${BINDING_NAME}/QtCore/ diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt index 5b20fd9..8823838 100644 --- a/PySide/QtMultimedia/CMakeLists.txt +++ b/PySide/QtMultimedia/CMakeLists.txt @@ -27,7 +27,7 @@ set(QtMultimedia_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTMULTIMEDIA_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${QtGui_BINARY_DIR}/PySide/QtGui/) diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt index 40d114d..3afa0cf 100644 --- a/PySide/QtNetwork/CMakeLists.txt +++ b/PySide/QtNetwork/CMakeLists.txt @@ -57,7 +57,7 @@ set(QtNetwork_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTNETWORK_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/) set(QtNetwork_libraries pyside ${SHIBOKEN_PYTHON_LIBRARIES} diff --git a/PySide/QtOpenGL/CMakeLists.txt b/PySide/QtOpenGL/CMakeLists.txt index 16e6937..44ba1c1 100644 --- a/PySide/QtOpenGL/CMakeLists.txt +++ b/PySide/QtOpenGL/CMakeLists.txt @@ -37,7 +37,7 @@ set(QtOpenGL_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${QtGui_BINARY_DIR}/PySide/QtGui/ diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt index 4bac4eb..88b0a06 100644 --- a/PySide/QtScript/CMakeLists.txt +++ b/PySide/QtScript/CMakeLists.txt @@ -32,7 +32,7 @@ set(QtScript_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTSCRIPT_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore ) set(QtScript_libraries pyside ${SHIBOKEN_PYTHON_LIBRARIES} diff --git a/PySide/QtScriptTools/CMakeLists.txt b/PySide/QtScriptTools/CMakeLists.txt index a2e059f..575dcc3 100644 --- a/PySide/QtScriptTools/CMakeLists.txt +++ b/PySide/QtScriptTools/CMakeLists.txt @@ -12,7 +12,7 @@ set(QtScriptTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_GUI_INCLUDE_DIR} ${QT_QTSCRIPT_INCLUDE_DIR} ${QT_QTSCRIPTTOOLS_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ diff --git a/PySide/QtSql/CMakeLists.txt b/PySide/QtSql/CMakeLists.txt index 40caafb..7da42d4 100644 --- a/PySide/QtSql/CMakeLists.txt +++ b/PySide/QtSql/CMakeLists.txt @@ -26,7 +26,7 @@ set(QtSql_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTSQL_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt index f5159d3..b1e5477 100644 --- a/PySide/QtSvg/CMakeLists.txt +++ b/PySide/QtSvg/CMakeLists.txt @@ -17,7 +17,7 @@ set(QtSvg_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTSVG_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${QtGui_BINARY_DIR}/PySide/QtGui/) set(QtSvg_libraries pyside diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt index 696adc8..fea841d 100644 --- a/PySide/QtTest/CMakeLists.txt +++ b/PySide/QtTest/CMakeLists.txt @@ -14,7 +14,7 @@ set(QtTest_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTTEST_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${QtGui_BINARY_DIR}/PySide/QtGui/) set(QtTest_libraries pyside diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt index fd26ed5..195cb81 100644 --- a/PySide/QtUiTools/CMakeLists.txt +++ b/PySide/QtUiTools/CMakeLists.txt @@ -12,7 +12,7 @@ set(QtUiTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTDESIGNER_INCLUDE_DIR} ${QT_QTUITOOLS_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${plugins_SOURCE_DIR} diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt index 8b6e040..479448a 100644 --- a/PySide/QtWebKit/CMakeLists.txt +++ b/PySide/QtWebKit/CMakeLists.txt @@ -41,7 +41,7 @@ set(QtWebkit_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTWEBKIT_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ ${QtGui_BINARY_DIR}/PySide/QtGui/ ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/ ) diff --git a/PySide/QtXml/CMakeLists.txt b/PySide/QtXml/CMakeLists.txt index a801102..a06c710 100644 --- a/PySide/QtXml/CMakeLists.txt +++ b/PySide/QtXml/CMakeLists.txt @@ -44,7 +44,7 @@ set(QtXml_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTXML_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore) set(QtXml_libraries pyside ${SHIBOKEN_PYTHON_LIBRARIES} diff --git a/PySide/QtXmlPatterns/CMakeLists.txt b/PySide/QtXmlPatterns/CMakeLists.txt index eeca184..0d789ff 100644 --- a/PySide/QtXmlPatterns/CMakeLists.txt +++ b/PySide/QtXmlPatterns/CMakeLists.txt @@ -30,7 +30,7 @@ set(QtXmlPatterns_typesystem_path "${QtCore_SOURCE_DIR}") set(QtXmlPatterns_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTXMLPATTERNS_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${QtCore_BINARY_DIR}/PySide/QtCore/ diff --git a/PySide/phonon/CMakeLists.txt b/PySide/phonon/CMakeLists.txt index 183d8fe..0452d1b 100644 --- a/PySide/phonon/CMakeLists.txt +++ b/PySide/phonon/CMakeLists.txt @@ -51,7 +51,7 @@ set(phonon_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_PHONON_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${QtGui_BINARY_DIR}/PySide/QtGui/ |