jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use correct python lib in debug mode.

Browse source 
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Luciano Wolf <luciano.wolf@openbossa.org>
This commit is contained in:
Renato Filho 2010-07-19 15:19:45 -03:00
commit 8bde4b3800
20 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -41,6 +41,11 @@ find_package(PythonInterpWithDebug REQUIRED)
find_package(Shiboken 0.3.3 REQUIRED) find_package(Shiboken 0.3.3 REQUIRED)
find_package(Qt4 4.5.0 REQUIRED) find_package(Qt4 4.5.0 REQUIRED)
#Fix missing variable on UNIX env
if(NOT PYTHON_DEBUG_LIBRARIES AND UNIX)
set(PYTHON_DEBUG_LIBRARIES "${PYTHON_LIBRARIES}")
endif()
set(BINDING_NAME PySide) set(BINDING_NAME PySide)
set(BINDING_API_MAJOR_VERSION "0") set(BINDING_API_MAJOR_VERSION "0")
set(BINDING_API_MINOR_VERSION "3") set(BINDING_API_MINOR_VERSION "3")
@ -135,9 +140,20 @@ execute_process(
print sysconfig.get_config_var('Py_DEBUG')" print sysconfig.get_config_var('Py_DEBUG')"
OUTPUT_VARIABLE PY_DEBUG OUTPUT_VARIABLE PY_DEBUG
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if (PY_DEBUG)
add_definitions("-DPy_DEBUG") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
if(NOT PYTHON_DEBUG_LIBRARIES)
message(FATAL_ERROR "Python debug library not found. Try compile PySide with -DCMAKE_BUILD_TYPE=Release")
endif() endif()
if(NOT PY_DEBUG)
message(WARNING "Compiling PySide with debug enabled, but the python executable was not compiled with debug support.")
endif()
add_definitions("-DPy_DEBUG")
set(PYSIDE_PYTHON_LIBRARIES ${PYTHON_DEBUG_LIBRARIES})
else()
set(PYSIDE_PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
endif()
set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic) set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)

2
PySide/QtCore/CMakeLists.txt
View file

@ -147,7 +147,7 @@ add_library(QtCore MODULE ${QtCore_SRC})
set_property(TARGET QtCore PROPERTY PREFIX "") set_property(TARGET QtCore PROPERTY PREFIX "")
target_link_libraries(QtCore target_link_libraries(QtCore
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
) )

2
PySide/QtDeclarative/CMakeLists.txt
View file

@ -38,7 +38,7 @@ add_library(QtDeclarative MODULE ${QtDeclarative_SRC})
set_target_properties(QtDeclarative PROPERTIES PREFIX "") set_target_properties(QtDeclarative PROPERTIES PREFIX "")
target_link_libraries(QtDeclarative target_link_libraries(QtDeclarative
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIBRARY}

2
PySide/QtGui/CMakeLists.txt
View file

@ -484,7 +484,7 @@ add_library(QtGui MODULE ${QtGui_SRC})
set_property(TARGET QtGui PROPERTY PREFIX "") set_property(TARGET QtGui PROPERTY PREFIX "")
target_link_libraries(QtGui target_link_libraries(QtGui
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
) )

2
PySide/QtHelp/CMakeLists.txt
View file

@ -33,7 +33,7 @@ set_target_properties(QtHelp PROPERTIES PREFIX "")
target_link_libraries(QtHelp target_link_libraries(QtHelp
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTHELP_LIBRARY}) ${QT_QTHELP_LIBRARY})

2
PySide/QtMaemo5/CMakeLists.txt
View file

@ -41,7 +41,7 @@ set_target_properties(QtMaemo5 PROPERTIES
target_link_libraries(QtMaemo5 target_link_libraries(QtMaemo5
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTMAEMO5_LIBRARY}) ${QT_QTMAEMO5_LIBRARY})

2
PySide/QtMultimedia/CMakeLists.txt
View file

@ -37,7 +37,7 @@ add_library(QtMultimedia MODULE ${QtMultimedia_SRC})
set_property(TARGET QtMultimedia PROPERTY PREFIX "") set_property(TARGET QtMultimedia PROPERTY PREFIX "")
target_link_libraries(QtMultimedia target_link_libraries(QtMultimedia
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTMULTIMEDIA_LIBRARY} ${QT_QTMULTIMEDIA_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}

2
PySide/QtNetwork/CMakeLists.txt
View file

@ -114,7 +114,7 @@ add_library(QtNetwork MODULE ${QtNetwork_SRC})
set_property(TARGET QtNetwork PROPERTY PREFIX "") set_property(TARGET QtNetwork PROPERTY PREFIX "")
target_link_libraries(QtNetwork target_link_libraries(QtNetwork
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIBRARY}
) )

2
PySide/QtOpenGL/CMakeLists.txt
View file

@ -48,7 +48,7 @@ add_library(QtOpenGL MODULE ${QtOpenGL_SRC})
set_target_properties(QtOpenGL PROPERTIES PREFIX "") set_target_properties(QtOpenGL PROPERTIES PREFIX "")
target_link_libraries(QtOpenGL target_link_libraries(QtOpenGL
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTOPENGL_LIBRARY}) ${QT_QTOPENGL_LIBRARY})

2
PySide/QtScript/CMakeLists.txt
View file

@ -40,7 +40,7 @@ add_library(QtScript MODULE ${QtScript_SRC})
set_property(TARGET QtScript PROPERTY PREFIX "") set_property(TARGET QtScript PROPERTY PREFIX "")
target_link_libraries(QtScript target_link_libraries(QtScript
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTSCRIPT_LIBRARY} ${QT_QTSCRIPT_LIBRARY}

2
PySide/QtScriptTools/CMakeLists.txt
View file

@ -24,7 +24,7 @@ add_library(QtScriptTools MODULE ${QtScriptTools_SRC})
set_target_properties(QtScriptTools PROPERTIES PREFIX "") set_target_properties(QtScriptTools PROPERTIES PREFIX "")
target_link_libraries(QtScriptTools target_link_libraries(QtScriptTools
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_GUI_LIBRARY} ${QT_GUI_LIBRARY}
${QT_QTSCRIPT_LIBRARY} ${QT_QTSCRIPT_LIBRARY}

2
PySide/QtSql/CMakeLists.txt
View file

@ -37,7 +37,7 @@ add_library(QtSql MODULE ${QtSql_SRC})
set_target_properties(QtSql PROPERTIES PREFIX "") set_target_properties(QtSql PROPERTIES PREFIX "")
target_link_libraries(QtSql target_link_libraries(QtSql
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTSQL_LIBRARY}) ${QT_QTSQL_LIBRARY})

2
PySide/QtSvg/CMakeLists.txt
View file

@ -49,7 +49,7 @@ add_library(QtSvg MODULE ${QtSvg_SRC})
set_property(TARGET QtSvg PROPERTY PREFIX "") set_property(TARGET QtSvg PROPERTY PREFIX "")
target_link_libraries(QtSvg target_link_libraries(QtSvg
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTSVG_LIBRARY} ${QT_QTSVG_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}

2
PySide/QtTest/CMakeLists.txt
View file

@ -37,7 +37,7 @@ add_library(QtTest MODULE ${QtTest_SRC})
set_property(TARGET QtTest PROPERTY PREFIX "") set_property(TARGET QtTest PROPERTY PREFIX "")
target_link_libraries(QtTest target_link_libraries(QtTest
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}

2
PySide/QtUiTools/CMakeLists.txt
View file

@ -24,7 +24,7 @@ add_library(QtUiTools MODULE ${QtUiTools_SRC})
set_target_properties(QtUiTools PROPERTIES PREFIX "") set_target_properties(QtUiTools PROPERTIES PREFIX "")
target_link_libraries(QtUiTools target_link_libraries(QtUiTools
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTUITOOLS_LIBRARY}) ${QT_QTUITOOLS_LIBRARY})

2
PySide/QtWebKit/CMakeLists.txt
View file

@ -65,7 +65,7 @@ add_library(QtWebKit MODULE ${QtWebKit_SRC})
set_property(TARGET QtWebKit PROPERTY PREFIX "") set_property(TARGET QtWebKit PROPERTY PREFIX "")
target_link_libraries(QtWebKit target_link_libraries(QtWebKit
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTWEBKIT_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIBRARY}

2
PySide/QtXml/CMakeLists.txt
View file

@ -52,7 +52,7 @@ add_library(QtXml MODULE ${QtXml_SRC})
set_property(TARGET QtXml PROPERTY PREFIX "") set_property(TARGET QtXml PROPERTY PREFIX "")
target_link_libraries(QtXml target_link_libraries(QtXml
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTXML_LIBRARY} ${QT_QTXML_LIBRARY}
) )

2
PySide/QtXmlPatterns/CMakeLists.txt
View file

@ -41,7 +41,7 @@ add_library(QtXmlPatterns MODULE ${QtXmlPatterns_SRC})
set_target_properties(QtXmlPatterns PROPERTIES PREFIX "") set_target_properties(QtXmlPatterns PROPERTIES PREFIX "")
target_link_libraries(QtXmlPatterns target_link_libraries(QtXmlPatterns
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTXMLPATTERNS_LIBRARY}) ${QT_QTXMLPATTERNS_LIBRARY})
add_dependencies(QtXmlPatterns QtCore) add_dependencies(QtXmlPatterns QtCore)

2
PySide/phonon/CMakeLists.txt
View file

@ -60,7 +60,7 @@ add_library(phonon MODULE ${phonon_SRC})
set_target_properties(phonon PROPERTIES PREFIX "") set_target_properties(phonon PROPERTIES PREFIX "")
target_link_libraries(phonon target_link_libraries(phonon
pyside pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_PHONON_LIBRARY}) ${QT_PHONON_LIBRARY})

2
libpyside/CMakeLists.txt
View file

@ -17,7 +17,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
add_library(pyside SHARED ${libpyside_SRC}) add_library(pyside SHARED ${libpyside_SRC})
target_link_libraries(pyside target_link_libraries(pyside
${PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY} ${SHIBOKEN_LIBRARY}
${QT_QTCORE_LIBRARY}) ${QT_QTCORE_LIBRARY})