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

Changed output dir for python modules to make the tests run in others platafforms.

Browse source 
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Renato Filho 2010-08-20 13:36:02 -03:00
commit af8bf30d06
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PySide/CMakeLists.txt
View file

@ -21,7 +21,7 @@ macro(create_pyside_module module_name typesystem_file module_include_dir module
include_directories(${module_name} ${${module_include_dir}}) include_directories(${module_name} ${${module_include_dir}})
add_library(${module_name} MODULE ${${module_sources}}) add_library(${module_name} MODULE ${${module_sources}})
set_target_properties(${module_name} PROPERTIES PREFIX "") set_target_properties(${module_name} PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY ${pyside_BINARY_DIR})
if(WIN32) if(WIN32)
set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd") set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")
endif() endif()
@ -31,7 +31,7 @@ macro(create_pyside_module module_name typesystem_file module_include_dir module
endif() endif()
# install # install
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${module_name}${CMAKE_DEBUG_POSTFIX}.so install(FILES ${pyside_BINARY_DIR}/${module_name}${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide) DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module_name}/pyside_${module_name}_python.h install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module_name}/pyside_${module_name}_python.h
DESTINATION include/PySide/${module_name}/) DESTINATION include/PySide/${module_name}/)
@ -52,15 +52,13 @@ if (DISABLE_${name})
else() else()
if (${var}) if (${var})
add_subdirectory(${name}) add_subdirectory(${name})
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/${name}/${name}${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_MODULE_SUFFIX}"
"${CMAKE_BINARY_DIR}/PySide/${name}${CMAKE_SHARED_MODULE_SUFFIX}")
else() else()
message(STATUS "${name} NOT found. ${name} support disabled.") message(STATUS "${name} NOT found. ${name} support disabled.")
endif() endif()
endif() endif()
endmacro(HAS_QT_MODULE) endmacro(HAS_QT_MODULE)
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py" execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py"
"${CMAKE_BINARY_DIR}/PySide/__init__.py") "${CMAKE_BINARY_DIR}/PySide/__init__.py")
# Try to find QtMultimedia # Try to find QtMultimedia
# TODO: Remove this hack when cmake support QtMultimedia module # TODO: Remove this hack when cmake support QtMultimedia module

1
PySide/QtCore/typesystem_core.xml
View file

@ -36,7 +36,6 @@
<rejection class="QMetaObject" function-name="changeGuard"/> <rejection class="QMetaObject" function-name="changeGuard"/>
<rejection class="QMetaObject" function-name="removeGuard"/> <rejection class="QMetaObject" function-name="removeGuard"/>
<rejection calls="WId" />
<rejection class="QFutureSynchronizer"/> <rejection class="QFutureSynchronizer"/>
<rejection class="QByteArray" function-name="contains"/> <rejection class="QByteArray" function-name="contains"/>
<rejection class="QRunnable"/> <rejection class="QRunnable"/>