diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-10-27 15:01:19 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:56:15 -0300 |
| commit | f57d4d4dbc212bb13a28f10932197fc0548c842f (patch) | |
| tree | 4a37c185a868455faf2c8c0ce0c2fbc2d90b1ff7 /libpyside | |
| parent | 5c076e1c5304fc31f981f9a4e80ce5a6602bbb9c (diff) | |
Fix bug 1011 - "PySide cygwin patch"
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>
Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'libpyside')
| -rw-r--r-- | libpyside/PySideConfig-spec.cmake.in | 2 | ||||
| -rw-r--r-- | libpyside/pysidemacros.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpyside/PySideConfig-spec.cmake.in b/libpyside/PySideConfig-spec.cmake.in index 57ccd317b..f3631542c 100644 --- a/libpyside/PySideConfig-spec.cmake.in +++ b/libpyside/PySideConfig-spec.cmake.in @@ -4,6 +4,6 @@ # 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_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_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems") diff --git a/libpyside/pysidemacros.h b/libpyside/pysidemacros.h index a652ba29f..fb5914f9f 100644 --- a/libpyside/pysidemacros.h +++ b/libpyside/pysidemacros.h @@ -23,7 +23,7 @@ #ifndef PYSIDEMACROS_H #define PYSIDEMACROS_H -#if defined _WIN32 || defined __CYGWIN__ +#if defined _WIN32 #if PYSIDE_EXPORTS #define PYSIDE_API __declspec(dllexport) #else |