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

Fix bug 1011 - "PySide cygwin patch"

Browse source 
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>
This commit is contained in:
Hugo Parente Lima 2011-10-27 15:01:19 -02:00
commit f57d4d4dbc
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -32,7 +32,7 @@ endif()
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DNOCOLOR /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS") set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DNOCOLOR /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS")
else() else()
if(CMAKE_HOST_UNIX) if(CMAKE_HOST_UNIX AND NOT CYGWIN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -Wno-strict-aliasing") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -Wno-strict-aliasing")
endif() endif()
set(CMAKE_CXX_FLAGS_DEBUG "-g") set(CMAKE_CXX_FLAGS_DEBUG "-g")

2
PySide/QtCore/qstring_conversions.h
View file

@ -23,7 +23,7 @@ struct Converter<QString>
{ {
if (PyUnicode_Check(pyObj)) { if (PyUnicode_Check(pyObj)) {
Py_UNICODE* unicode = PyUnicode_AS_UNICODE(pyObj); Py_UNICODE* unicode = PyUnicode_AS_UNICODE(pyObj);
#if defined(Py_UNICODE_WIDE) #if defined(Py_UNICODE_WIDE) || defined(__CYGWIN__)
// cast as Py_UNICODE can be a different type // cast as Py_UNICODE can be a different type
return QString::fromUcs4(reinterpret_cast<const uint*>(unicode)); return QString::fromUcs4(reinterpret_cast<const uint*>(unicode));
#else #else

6
PySide/QtUiTools/CMakeLists.txt
View file

@ -23,10 +23,10 @@ set(QtUiTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
set(QtUiTools_libraries pyside set(QtUiTools_libraries pyside
uiplugin uiplugin
${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTUITOOLS_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTDESIGNER_LIBRARY} ${QT_QTDESIGNER_LIBRARY}
${QT_QTUITOOLS_LIBRARY}) ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY})
set(QtUiTools_deps QtGui QtXml) set(QtUiTools_deps QtGui QtXml)
create_pyside_module(QtUiTools create_pyside_module(QtUiTools
QtUiTools_include_dirs QtUiTools_include_dirs

2
cmake/Macros/PySideModules.cmake
View file

@ -39,7 +39,7 @@ macro(create_pyside_module module_name module_include_dir module_libraries modul
set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd") set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")
set(${module_name}_suffix ".pyd") set(${module_name}_suffix ".pyd")
else() else()
set(${module_name}_suffix ".so") set(${module_name}_suffix ${CMAKE_SHARED_MODULE_SUFFIX})
endif() endif()
target_link_libraries(${module_name} ${${module_libraries}}) target_link_libraries(${module_name} ${${module_libraries}})
if(${module_deps}) if(${module_deps})

2
libpyside/PySideConfig-spec.cmake.in
View file

@ -4,6 +4,6 @@
# PYSIDE_TYPESYSTEMS - Type system files that should be used by other bindings extending PySide # PYSIDE_TYPESYSTEMS - Type system files that should be used by other bindings extending PySide
SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide@pyside_SUFFIX@") SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide@pyside_SUFFIX@")
SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@CMAKE_IMPORT_LIBRARY_SUFFIX@")
SET(PYSIDE_PYTHONPATH "@SITE_PACKAGE@") SET(PYSIDE_PYTHONPATH "@SITE_PACKAGE@")
SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems") SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems")

2
libpyside/pysidemacros.h
View file

@ -23,7 +23,7 @@
#ifndef PYSIDEMACROS_H #ifndef PYSIDEMACROS_H
#define PYSIDEMACROS_H #define PYSIDEMACROS_H
#if defined _WIN32 || defined __CYGWIN__ #if defined _WIN32
#if PYSIDE_EXPORTS #if PYSIDE_EXPORTS
#define PYSIDE_API __declspec(dllexport) #define PYSIDE_API __declspec(dllexport)
#else #else