summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2010-10-25 18:23:03 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-10-26 13:49:07 -0300
commitb0e9403d48c4c7a21ae8d7e2eaf26d712a835556 (patch)
treed5192f64d29aac834f67eac962ce696d204f7fd3
parent720c76980dedd51abee7f182bd261a9ce5405a5e (diff)
downloadpyside-b0e9403d48c4c7a21ae8d7e2eaf26d712a835556.tar.gz
pyside-b0e9403d48c4c7a21ae8d7e2eaf26d712a835556.tar.xz
pyside-b0e9403d48c4c7a21ae8d7e2eaf26d712a835556.zip
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 <lauro.neto@openbossa.org> Reviewed by Renato Araujo <renato.filho@openbossa.org>
-rw-r--r--CMakeLists.txt10
-rw-r--r--PySide/QtCore/CMakeLists.txt2
-rw-r--r--PySide/QtDeclarative/CMakeLists.txt2
-rw-r--r--PySide/QtGui/CMakeLists.txt2
-rw-r--r--PySide/QtHelp/CMakeLists.txt2
-rw-r--r--PySide/QtMaemo5/CMakeLists.txt2
-rw-r--r--PySide/QtMultimedia/CMakeLists.txt2
-rw-r--r--PySide/QtNetwork/CMakeLists.txt2
-rw-r--r--PySide/QtOpenGL/CMakeLists.txt2
-rw-r--r--PySide/QtScript/CMakeLists.txt2
-rw-r--r--PySide/QtScriptTools/CMakeLists.txt2
-rw-r--r--PySide/QtSql/CMakeLists.txt2
-rw-r--r--PySide/QtSvg/CMakeLists.txt2
-rw-r--r--PySide/QtTest/CMakeLists.txt2
-rw-r--r--PySide/QtUiTools/CMakeLists.txt2
-rw-r--r--PySide/QtWebKit/CMakeLists.txt2
-rw-r--r--PySide/QtXml/CMakeLists.txt2
-rw-r--r--PySide/QtXmlPatterns/CMakeLists.txt2
-rw-r--r--PySide/phonon/CMakeLists.txt2
-rw-r--r--libpyside/CMakeLists.txt2
20 files changed, 19 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e148c2a..fc7c37d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,16 +151,6 @@ if (NOT SITE_PACKAGE)
endif()
endif()
-if(SHIBOKEN_BUILD_TYPE STREQUAL "Debug")
- add_definitions("-DPy_DEBUG")
- set(PYSIDE_PYTHON_LIBRARIES ${PYTHON_DEBUG_LIBRARIES})
-else()
- set(PYSIDE_PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
-endif()
-if(APPLE)
- set(PYSIDE_PYTHON_LIBRARIES "-undefined dynamic_lookup")
-endif()
-
set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
enable_testing()
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 554cefb..cbc3519 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 1966cab..21090df 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 85c61b9..ae0c0b9 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 1f7a3cd..f337163 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 1d4b296..7222db0 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 7db481e..5b20fd9 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 faf5a1d..40d114d 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 8e72a6a..16e6937 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 af38768..4bac4eb 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 246cb92..a2e059f 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 c5777dd..40caafb 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 0c31dbf..f5159d3 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 064e9a8..696adc8 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 4054ffc..fd26ed5 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 d23fa3e..8b6e040 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 f461a93..a801102 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 6c11213..eeca184 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 198ed6e..183d8fe 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})
diff --git a/libpyside/CMakeLists.txt b/libpyside/CMakeLists.txt
index 20bd03a..73372e8 100644
--- a/libpyside/CMakeLists.txt
+++ b/libpyside/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
add_library(pyside SHARED ${libpyside_SRC})
target_link_libraries(pyside
- ${PYSIDE_PYTHON_LIBRARIES}
+ ${SHIBOKEN_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY}
${QT_QTCORE_LIBRARY})