created macro to compile pyside modules.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>

18 files changed, 428 insertions, 524 deletions

diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt
index b1b328641..22ccde833 100644
--- a/PySide/CMakeLists.txt
+++ b/PySide/CMakeLists.txt
@@ -3,20 +3,40 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py"
         DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}")
 
 macro(execute_generator module sources typesystem_path)
-add_custom_command(OUTPUT ${${sources}}
-COMMAND ${GENERATOR} ${GENERATOR_EXTRA_FLAGS}
-        ${CMAKE_BINARY_DIR}/PySide/global.h
-        --include-paths=${pyside_SOURCE_DIR}:${QT_INCLUDE_DIR}
-        --typesystem-paths=${pyside_SOURCE_DIR}:${typesystem_path}
-        --output-directory=${CMAKE_CURRENT_BINARY_DIR}
-        --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
-        ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${module}.xml
-        --api-version=${SUPPORTED_QT_VERSION}
-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-COMMENT "Running generator for ${module}..."
-)
+    message("Running generator for ${module}...")
 endmacro(execute_generator)
 
+macro(create_pyside_module module_name typesystem_file module_include_dir module_libraries module_deps module_typesystem_path module_sources)
+    add_custom_command(OUTPUT ${${module_sources}}
+                        COMMAND ${GENERATOR} ${GENERATOR_EXTRA_FLAGS}
+                        ${CMAKE_BINARY_DIR}/PySide/global.h
+                        --include-paths=${pyside_SOURCE_DIR}:${QT_INCLUDE_DIR}
+                        --typesystem-paths=${pyside_SOURCE_DIR}:${${module_typesystem_path}}
+                        --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+                        --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
+                        ${typesystem_file}
+                        --api-version=${SUPPORTED_QT_VERSION}
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                        COMMENT "Running generator for ${module_name}...")
+
+    include_directories(${module_name} ${${module_include_dir}})
+    add_library(${module_name} MODULE ${${module_sources}})
+    set_target_properties(${module_name} PROPERTIES PREFIX "")
+    target_link_libraries(${module_name} ${${module_libraries}})
+    if(${module_deps})
+        add_dependencies(${module_name} ${${module_deps}})
+    endif()
+
+    # install
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${module_name}${CMAKE_DEBUG_POSTFIX}.so
+            DESTINATION ${SITE_PACKAGE}/PySide)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module_name}/pyside_${module_name}_python.h
+            DESTINATION include/PySide/${module_name}/)
+    install(FILES ${typesystem_file}
+            DESTINATION share/PySide/typesystems)
+endmacro(create_pyside_module)
+
+
 # Configure include based on platform
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in"
                "${CMAKE_CURRENT_BINARY_DIR}/global.h" @ONLY)
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 6300a4cb3..b6c753416 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -134,29 +134,22 @@ ${QtCore_46_SRC}
 ${QtCore_47_SRC}
 )
 
-execute_generator(core QtCore_SRC "${CMAKE_CURRENT_BINARY_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/
-                    ${QT_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    )
-add_library(QtCore MODULE ${QtCore_SRC})
-set_property(TARGET QtCore PROPERTY PREFIX "")
-target_link_libraries(QtCore
-                      pyside
+set(QtCore_typesystem_path ${CMAKE_CURRENT_BINARY_DIR})
+set(QtCore_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/
+                        ${QT_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${PYTHON_INCLUDE_PATH})
+set(QtCore_libraries  pyside
                       ${PYSIDE_PYTHON_LIBRARIES}
                       ${SHIBOKEN_LIBRARY}
-                      ${QT_QTCORE_LIBRARY}
-                      )
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtCore${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/pyside_qtcore_python.h
-        DESTINATION include/PySide/QtCore/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_core.xml
-        DESTINATION share/PySide/typesystems)
+                      ${QT_QTCORE_LIBRARY})
 
+create_pyside_module(QtCore
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_core.xml
+                     QtCore_include_dirs
+                     QtCore_libraries
+                     ""
+                     QtCore_typesystem_path
+                     QtCore_SRC)
diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt
index 79b4b429b..fc3810382 100644
--- a/PySide/QtDeclarative/CMakeLists.txt
+++ b/PySide/QtDeclarative/CMakeLists.txt
@@ -20,43 +20,40 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeview_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qtdeclarative_module_wrapper.cpp
 )
 
-execute_generator(declarative QtDeclarative_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtDeclarative_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtNetwork_BINARY_DIR}")
+set(QtDeclarative_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtDeclarative_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtNetwork_BINARY_DIR}")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTNETWORK_INCLUDE_DIR}
-                    ${QT_QTDECLARATIVE_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative)
-add_library(QtDeclarative MODULE ${QtDeclarative_SRC})
-set_target_properties(QtDeclarative PROPERTIES PREFIX "")
-target_link_libraries(QtDeclarative
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTNETWORK_LIBRARY}
-                      ${QT_QTSCRIPT_LIBRARY}
-                      ${QT_QTSVG_LIBRARY}
-                      ${QT_QTSQL_LIBRARY}
-                      ${QT_QTXMLPATTERNS_LIBRARY}
-                      ${QT_QTOPENGL_LIBRARY}
-                      ${QT_QTDECLARATIVE_LIBRARY})
-add_dependencies(QtDeclarative QtGui)
-add_dependencies(QtDeclarative QtNetwork)
+set(QtDeclarative_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTGUI_INCLUDE_DIR}
+                            ${QT_QTNETWORK_INCLUDE_DIR}
+                            ${QT_QTDECLARATIVE_INCLUDE_DIR}
+                            ${PYTHON_INCLUDE_PATH}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${QtGui_BINARY_DIR}/PySide/QtGui/
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/
+                            ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative)
 
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtDeclarative${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/pyside_qtdeclarative_python.h
-        DESTINATION include/PySide/QtDeclarative/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_declarative.xml
-        DESTINATION share/PySide/typesystems)
+set(QtDeclarative_libraries   pyside
+                              ${PYSIDE_PYTHON_LIBRARIES}
+                              ${QT_QTCORE_LIBRARY}
+                              ${QT_QTGUI_LIBRARY}
+                              ${QT_QTNETWORK_LIBRARY}
+                              ${QT_QTSCRIPT_LIBRARY}
+                              ${QT_QTSVG_LIBRARY}
+                              ${QT_QTSQL_LIBRARY}
+                              ${QT_QTXMLPATTERNS_LIBRARY}
+                              ${QT_QTOPENGL_LIBRARY}
+                              ${QT_QTDECLARATIVE_LIBRARY})
 
+set(QtDeclarative_deps QtGui QtNetwork)
+
+create_pyside_module(QtDeclarative
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_declarative.xml
+                     QtDeclarative_include_dirs
+                     QtDeclarative_libraries
+                     QtDeclarative_deps
+                     QtDeclarative_typesystem_path
+                     QtDeclarative_SRC)
 
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index fdc36b304..18ce25601 100644
--- a/PySide/QtGui/CMakeLists.txt
+++ b/PySide/QtGui/CMakeLists.txt
@@ -470,34 +470,32 @@ CHECK_QT_GUI_MACRO("SessionManager Support" QT_NO_SESSIONMANAGER QT_SESSIONMANAG
 configure_file(typesystem_gui.xml.in
                "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY)
 
-execute_generator(gui QtGui_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtCore_BINARY_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/
-                    ${QT_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    )
-add_library(QtGui MODULE ${QtGui_SRC})
-set_property(TARGET QtGui PROPERTY PREFIX "")
-target_link_libraries(QtGui
-                      pyside
+set(QtGui_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtCore_BINARY_DIR}")
+set(QtGui_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/
+                        ${QT_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${PYTHON_INCLUDE_PATH}
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/)
+set(QtGui_libraries   pyside
                       ${PYSIDE_PYTHON_LIBRARIES}
                       ${SHIBOKEN_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      )
-add_dependencies(QtGui QtCore)
+                      ${QT_QTGUI_LIBRARY})
+set(QtGui_deps "QtCore")
 
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui${CMAKE_DEBUG_POSTFIX}.so DESTINATION "${SITE_PACKAGE}/PySide")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/pyside_qtgui_python.h
-        DESTINATION include/PySide/QtGui/)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml
-              ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_common.xml
+# extra install
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_common.xml
               ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_mac.xml
               ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_maemo.xml
               ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_x11.xml
         DESTINATION share/PySide/typesystems)
 
+create_pyside_module(QtGui
+                     ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml
+                     QtGui_include_dirs
+                     QtGui_libraries
+                     QtGui_deps
+                     QtGui_typesystem_path
+                     QtGui_SRC)
+
diff --git a/PySide/QtHelp/CMakeLists.txt b/PySide/QtHelp/CMakeLists.txt
index 42b073705..d5140c2d9 100644
--- a/PySide/QtHelp/CMakeLists.txt
+++ b/PySide/QtHelp/CMakeLists.txt
@@ -15,35 +15,28 @@ set(QtHelp_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp/qthelp_module_wrapper.cpp
 )
 
-execute_generator(help QtHelp_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtHelp_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTHELP_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp)
-add_library(QtHelp MODULE ${QtHelp_SRC})
-
-set_target_properties(QtHelp PROPERTIES PREFIX "")
-
-target_link_libraries(QtHelp
-                      pyside
+set(QtHelp_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtHelp_SOURCE_DIR}")
+set(QtHelp_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTHELP_INCLUDE_DIR}
+                        ${PYTHON_INCLUDE_PATH}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp)
+set(QtHelp_libraries  pyside
                       ${PYSIDE_PYTHON_LIBRARIES}
                       ${QT_QTCORE_LIBRARY}
                       ${QT_QTGUI_LIBRARY}
                       ${QT_QTHELP_LIBRARY})
-add_dependencies(QtHelp QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtHelp${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp/pyside_qthelp_python.h
-        DESTINATION include/PySide/QtHelp/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_help.xml
-        DESTINATION share/PySide/typesystems)
+set(QtHelp_deps QtGui)
 
+create_pyside_module(QtHelp
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_help.xml
+                     QtHelp_include_dirs
+                     QtHelp_libraries
+                     QtHelp_deps
+                     QtHelp_typesystem_path
+                     QtHelp_SRC)
diff --git a/PySide/QtMaemo5/CMakeLists.txt b/PySide/QtMaemo5/CMakeLists.txt
index 5338b8036..fbcf75f08 100644
--- a/PySide/QtMaemo5/CMakeLists.txt
+++ b/PySide/QtMaemo5/CMakeLists.txt
@@ -11,8 +11,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5/qmaemo5valuebutton_wrapper.
 ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5/qtmaemo5_module_wrapper.cpp
 )
 
-execute_generator(maemo5 QtMaemo5_SRC
-                  "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtMaemo5_SOURCE_DIR}")
+set(QtMaemo5_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtMaemo5_SOURCE_DIR}")
 
 # QT_QTMAEMO5_* variables are not defined by CMake
 if(NOT QT_QTMAEMO5_INCLUDE_DIR)
@@ -24,35 +23,28 @@ if(NOT QT_QTMAEMO5_LIBRARY)
                PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 endif(NOT QT_QTMAEMO5_LIBRARY)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTMAEMO5_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtCore_BINARY_DIR}/${BINDING_NAME}/QtCore/
-                    ${QtGui_BINARY_DIR}/${BINDING_NAME}/QtGui/
-                    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5)
-add_library(QtMaemo5 MODULE ${QtMaemo5_SRC})
-
-set_target_properties(QtMaemo5 PROPERTIES
-                      PREFIX "")
-
-target_link_libraries(QtMaemo5
-                      pyside
+set(QtMaemo5_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTMAEMO5_INCLUDE_DIR}
+                        ${PYTHON_INCLUDE_PATH}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${QtCore_BINARY_DIR}/${BINDING_NAME}/QtCore/
+                        ${QtGui_BINARY_DIR}/${BINDING_NAME}/QtGui/
+                        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5)
+set(QtMaemo5_libraries  pyside
                       ${PYSIDE_PYTHON_LIBRARIES}
                       ${QT_QTCORE_LIBRARY}
                       ${QT_QTGUI_LIBRARY}
                       ${QT_QTMAEMO5_LIBRARY})
-
-add_dependencies(QtMaemo5 QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMaemo5${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMaemo5/pyside_qtmaemo5_python.h
-        DESTINATION include/${BINDING_NAME}/QtMaemo5/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_maemo5.xml
-        DESTINATION share/PySide/typesystems)
+set(QtMaemo5_deps QtGui)
+
+create_pyside_module(QtMaemo5
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_maemo5.xml
+                     QtMaemo5_include_dirs
+                     QtMaemo5_libraries
+                     QtMaemo5_deps
+                     QtMaemo5_typesystem_path
+                     QtMaemo5_SRC)
 
diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt
index 20707f7f8..1829697ec 100644
--- a/PySide/QtMultimedia/CMakeLists.txt
+++ b/PySide/QtMultimedia/CMakeLists.txt
@@ -17,38 +17,32 @@ set(QtMultimedia_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qvideoframe_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qtmultimedia_module_wrapper.cpp
 )
+set(QtMultimedia_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
 
-execute_generator(multimedia QtMultimedia_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
+set(QtMultimedia_include_dirs   ${CMAKE_CURRENT_SOURCE_DIR}
+                                ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/
+                                ${QT_INCLUDE_DIR}
+                                ${QT_QTCORE_INCLUDE_DIR}
+                                ${QT_QTGUI_INCLUDE_DIR}
+                                ${QT_QTMULTIMEDIA_INCLUDE_DIR}
+                                ${SHIBOKEN_INCLUDE_DIR}
+                                ${libpyside_SOURCE_DIR}
+                                ${PYTHON_INCLUDE_PATH}
+                                ${QtCore_BINARY_DIR}/PySide/QtCore/
+                                ${QtGui_BINARY_DIR}/PySide/QtGui/)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTMULTIMEDIA_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    )
+set(QtMultimedia_libraries  pyside
+                            ${PYSIDE_PYTHON_LIBRARIES}
+                            ${SHIBOKEN_LIBRARY}
+                            ${QT_QTMULTIMEDIA_LIBRARY}
+                            ${QT_QTGUI_LIBRARY})
 
-add_library(QtMultimedia MODULE ${QtMultimedia_SRC})
-set_property(TARGET QtMultimedia PROPERTY PREFIX "")
-target_link_libraries(QtMultimedia
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTMULTIMEDIA_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      )
-add_dependencies(QtMultimedia QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMultimedia${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/pyside_qtmultimedia_python.h
-        DESTINATION include/PySide/QtMultimedia/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_multimedia.xml
-        DESTINATION share/PySide/typesystems)
+set(QtMultimedia_deps QtGui)
 
+create_pyside_module(QtMultimedia
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_multimedia.xml
+                     QtMultimedia_include_dirs
+                     QtMultimedia_libraries
+                     QtMultimedia_deps
+                     QtMultimedia_typesystem_path
+                     QtMultimedia_SRC)
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt
index 6afedbd0a..df3c12964 100644
--- a/PySide/QtNetwork/CMakeLists.txt
+++ b/PySide/QtNetwork/CMakeLists.txt
@@ -98,33 +98,26 @@ set(OPENSSL_SOURCES
 
 CHECK_QT_NETWORK_MACRO("Network OPENSSL" QT_NO_OPENSSL OPENSSL_SOURCES QtNetwork_SRC)
 
-execute_generator(network QtNetwork_SRC "${CMAKE_CURRENT_SOURCE_DIR}:${QtCore_SOURCE_DIR}")
+set(QtNetwork_typesystem_path "${CMAKE_CURRENT_SOURCE_DIR}:${QtCore_SOURCE_DIR}")
+set(QtNetwork_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/
+                            ${QT_INCLUDE_DIR}
+                            ${QT_QTNETWORK_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${PYTHON_INCLUDE_PATH}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/)
+set(QtNetwork_libraries pyside
+                        ${PYSIDE_PYTHON_LIBRARIES}
+                        ${SHIBOKEN_LIBRARY}
+                        ${QT_QTNETWORK_LIBRARY})
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTNETWORK_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    )
-
-add_library(QtNetwork MODULE ${QtNetwork_SRC})
-set_property(TARGET QtNetwork PROPERTY PREFIX "")
-target_link_libraries(QtNetwork
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTNETWORK_LIBRARY}
-                      )
-add_dependencies(QtNetwork QtCore)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/pyside_qtnetwork_python.h
-        DESTINATION include/PySide/QtNetwork/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_network.xml
-        DESTINATION share/PySide/typesystems)
+set(QtNetwork_deps QtCore)
 
+create_pyside_module(QtNetwork
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_network.xml
+                     QtNetwork_include_dirs
+                     QtNetwork_libraries
+                     QtNetwork_deps
+                     QtNetwork_typesystem_path
+                     QtNetwork_SRC)
diff --git a/PySide/QtOpenGL/CMakeLists.txt b/PySide/QtOpenGL/CMakeLists.txt
index 158f4be83..42173a41b 100644
--- a/PySide/QtOpenGL/CMakeLists.txt
+++ b/PySide/QtOpenGL/CMakeLists.txt
@@ -32,33 +32,27 @@ set(QtOpenGL_SRC
     ${QtOpenGL_47_SRC}
 )
 
-execute_generator(opengl QtOpenGL_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtOpenGL_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTOPENGL_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL)
-add_library(QtOpenGL MODULE ${QtOpenGL_SRC})
-set_target_properties(QtOpenGL PROPERTIES PREFIX "")
-target_link_libraries(QtOpenGL
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTOPENGL_LIBRARY})
-add_dependencies(QtOpenGL QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL/pyside_qtopengl_python.h
-        DESTINATION include/PySide/QtOpenGL/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_opengl.xml
-        DESTINATION share/PySide/typesystems)
-
+set(QtOpenGL_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtOpenGL_SOURCE_DIR}")
+set(QtOpenGL_include_dirs   ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTGUI_INCLUDE_DIR}
+                            ${QT_QTOPENGL_INCLUDE_DIR}
+                            ${PYTHON_INCLUDE_PATH}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${QtGui_BINARY_DIR}/PySide/QtGui/
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL)
+set(QtOpenGL_libraries      pyside
+                            ${PYSIDE_PYTHON_LIBRARIES}
+                            ${QT_QTCORE_LIBRARY}
+                            ${QT_QTGUI_LIBRARY}
+                            ${QT_QTOPENGL_LIBRARY})
+set(QtOpenGL_deps QtGui)
+create_pyside_module(QtOpenGL
+                    ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_opengl.xml
+                    QtOpenGL_include_dirs
+                    QtOpenGL_libraries
+                    QtOpenGL_deps
+                    QtOpenGL_typesystem_path
+                    QtOpenGL_SRC)
diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt
index af6ffd46c..d9e8264a8 100644
--- a/PySide/QtScript/CMakeLists.txt
+++ b/PySide/QtScript/CMakeLists.txt
@@ -25,33 +25,25 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptvalueiterator_wrapper.cpp
 ${QtScript_46_SRC}
 )
 
-execute_generator(script QtScript_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTSCRIPT_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore
-                    )
-add_library(QtScript MODULE ${QtScript_SRC})
-set_property(TARGET QtScript PROPERTY PREFIX "")
-target_link_libraries(QtScript
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTSCRIPT_LIBRARY}
-                      )
-add_dependencies(QtScript QtCore)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScript${CMAKE_DEBUG_POSTFIX}.so DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/pyside_qtscript_python.h
-        DESTINATION include/PySide/QtScript/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_script.xml
-        DESTINATION share/PySide/typesystems)
-
-
+set(QtScript_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
+set(QtScript_include_dirs   ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript
+                            ${QT_INCLUDE_DIR}
+                            ${QT_QTSCRIPT_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${PYTHON_INCLUDE_PATH}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore )
+set(QtScript_libraries      pyside
+                            ${PYSIDE_PYTHON_LIBRARIES}
+                            ${SHIBOKEN_LIBRARY}
+                            ${QT_QTCORE_LIBRARY}
+                            ${QT_QTSCRIPT_LIBRARY})
+set(QtScript_deps QtCore)
+create_pyside_module(QtScript
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_script.xml
+                     QtScript_include_dirs
+                     QtScript_libraries
+                     QtScript_deps
+                     QtScript_typesystem_path
+                     QtScript_SRC)
diff --git a/PySide/QtSql/CMakeLists.txt b/PySide/QtSql/CMakeLists.txt
index 1c45ac0b0..f8e105d42 100644
--- a/PySide/QtSql/CMakeLists.txt
+++ b/PySide/QtSql/CMakeLists.txt
@@ -21,35 +21,27 @@ set(QtSql_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/qtsql_module_wrapper.cpp
 )
 
-execute_generator(sql QtSql_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtSql_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTSQL_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/)
-add_library(QtSql MODULE ${QtSql_SRC})
-set_target_properties(QtSql PROPERTIES PREFIX "")
-target_link_libraries(QtSql
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTSQL_LIBRARY})
-
-add_dependencies(QtSql QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/pyside_qtsql_python.h
-        DESTINATION include/PySide/QtSql/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_sql.xml
-        DESTINATION share/PySide/typesystems)
-
-
+set(QtSql_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtSql_SOURCE_DIR}")
+set(QtSql_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTSQL_INCLUDE_DIR}
+                        ${PYTHON_INCLUDE_PATH}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/)
+set(QtSql_libraries     pyside
+                        ${PYSIDE_PYTHON_LIBRARIES}
+                        ${QT_QTCORE_LIBRARY}
+                        ${QT_QTGUI_LIBRARY}
+                        ${QT_QTSQL_LIBRARY})
+set(QtSql_deps QtGui)
+create_pyside_module(QtSql
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_sql.xml
+                     QtSql_include_dirs
+                     QtSql_libraries
+                     QtSql_deps
+                     QtSql_typesystem_path
+                     QtSql_SRC)
diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt
index 33cdba5c3..4119512ce 100644
--- a/PySide/QtSvg/CMakeLists.txt
+++ b/PySide/QtSvg/CMakeLists.txt
@@ -30,37 +30,28 @@ ${SPECIFIC_OS_FILES}
 ${QtSvg_46_SRC}
 )
 
-execute_generator(svg QtSvg_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTSVG_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    )
-
-add_library(QtSvg MODULE ${QtSvg_SRC})
-set_property(TARGET QtSvg PROPERTY PREFIX "")
-target_link_libraries(QtSvg
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTSVG_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      )
-add_dependencies(QtSvg QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSvg${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/pyside_qtsvg_python.h
-        DESTINATION include/PySide/QtSvg/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_svg.xml
-        DESTINATION share/PySide/typesystems)
-
+set(QtSvg_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
+set(QtSvg_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/
+                        ${QT_INCLUDE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTSVG_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${PYTHON_INCLUDE_PATH}
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/)
+set(QtSvg_libraries     pyside
+                        ${PYSIDE_PYTHON_LIBRARIES}
+                        ${SHIBOKEN_LIBRARY}
+                        ${QT_QTSVG_LIBRARY}
+                        ${QT_QTGUI_LIBRARY})
+set(QtSvg_deps QtGui)
+create_pyside_module(QtSvg
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_svg.xml
+                     QtSvg_include_dirs
+                     QtSvg_libraries
+                     QtSvg_deps
+                     QtSvg_typesystem_path
+                     QtSvg_SRC)
diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt
index 3ac608f9a..def84db80 100644
--- a/PySide/QtTest/CMakeLists.txt
+++ b/PySide/QtTest/CMakeLists.txt
@@ -18,38 +18,29 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp
 ${SPECIFIC_OS_FILES}
 )
 
-execute_generator(test QtTest_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTTEST_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    )
-
-add_library(QtTest MODULE ${QtTest_SRC})
-set_property(TARGET QtTest PROPERTY PREFIX "")
-target_link_libraries(QtTest
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTTEST_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTCORE_LIBRARY}
-                      )
-add_dependencies(QtTest QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtTest${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/pyside_qttest_python.h
-        DESTINATION include/PySide/QtTest/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_test.xml
-        DESTINATION share/PySide/typesystems)
-
+set(QtTest_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
+set(QtTest_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/
+                        ${QT_INCLUDE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTTEST_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${PYTHON_INCLUDE_PATH}
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/)
+set(QtTest_libraries    pyside
+                        ${PYSIDE_PYTHON_LIBRARIES}
+                        ${SHIBOKEN_LIBRARY}
+                        ${QT_QTTEST_LIBRARY}
+                        ${QT_QTGUI_LIBRARY}
+                        ${QT_QTCORE_LIBRARY})
+set(QtTest_deps  QtGui)
+create_pyside_module(QtTest
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_test.xml
+                     QtTest_include_dirs
+                     QtTest_libraries
+                     QtTest_deps
+                     QtTest_typesystem_path
+                     QtTest_SRC)
diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt
index 320fc1af8..9af11fb9a 100644
--- a/PySide/QtUiTools/CMakeLists.txt
+++ b/PySide/QtUiTools/CMakeLists.txt
@@ -5,37 +5,29 @@ set(QtUiTools_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools/quiloader_wrapper.cpp
 )
 
-execute_generator(uitools QtUiTools_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtXml_SOURCE_DIR}:${QtUiTools_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTXML_INCLUDE_DIR}
-                    ${QT_QTUITOOLS_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtXml_BINARY_DIR}/PySide/QtXml/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools)
-
-add_library(QtUiTools MODULE ${QtUiTools_SRC})
-set_target_properties(QtUiTools PROPERTIES PREFIX "")
-target_link_libraries(QtUiTools
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTUITOOLS_LIBRARY})
-
-add_dependencies(QtUiTools QtGui QtXml)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtUiTools${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools/pyside_qtuitools_python.h
-        DESTINATION include/PySide/QtUiTools/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_uitools.xml
-        DESTINATION share/PySide/typesystems)
-
+set(QtUiTools_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtXml_SOURCE_DIR}:${QtUiTools_SOURCE_DIR}")
+set(QtUiTools_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTGUI_INCLUDE_DIR}
+                            ${QT_QTXML_INCLUDE_DIR}
+                            ${QT_QTUITOOLS_INCLUDE_DIR}
+                            ${PYTHON_INCLUDE_PATH}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/
+                            ${QtXml_BINARY_DIR}/PySide/QtXml/
+                            ${QtGui_BINARY_DIR}/PySide/QtGui/
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools)
+set(QtUiTools_libraries     pyside
+                            ${PYSIDE_PYTHON_LIBRARIES}
+                            ${QT_QTCORE_LIBRARY}
+                            ${QT_QTGUI_LIBRARY}
+                            ${QT_QTUITOOLS_LIBRARY})
+set(QtUiTools_deps QtGui QtXml)
+create_pyside_module(QtUiTools
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_uitools.xml
+                     QtUiTools_include_dirs
+                     QtUiTools_libraries
+                     QtUiTools_deps
+                     QtUiTools_typesystem_path
+                     QtUiTools_SRC)
diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index 464bc2834..08e20be02 100644
--- a/PySide/QtWebKit/CMakeLists.txt
+++ b/PySide/QtWebKit/CMakeLists.txt
@@ -44,41 +44,32 @@ ${SPECIFIC_OS_FILES}
 ${QtWebKit_46_SRC}
 )
 
-execute_generator(webkit QtWebKit_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTNETWORK_INCLUDE_DIR}
-                    ${QT_QTWEBKIT_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/
-                    )
-
-add_library(QtWebKit MODULE ${QtWebKit_SRC})
-set_property(TARGET QtWebKit PROPERTY PREFIX "")
-target_link_libraries(QtWebKit
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTWEBKIT_LIBRARY}
-                      ${QT_QTNETWORK_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      )
-add_dependencies(QtWebKit QtGui)
-add_dependencies(QtWebKit QtNetwork)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtWebKit${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/pyside_qtwebkit_python.h
-        DESTINATION include/PySide/QtWebKit/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_webkit.xml
-        DESTINATION share/PySide/typesystems)
+set(QtWebKit_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
+set(QtWebkit_include_dirs   ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/
+                            ${QT_INCLUDE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTGUI_INCLUDE_DIR}
+                            ${QT_QTNETWORK_INCLUDE_DIR}
+                            ${QT_QTWEBKIT_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${PYTHON_INCLUDE_PATH}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/
+                            ${QtGui_BINARY_DIR}/PySide/QtGui/
+                            ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/ )
+set(QtWebKit_libraries      pyside
+                            ${PYSIDE_PYTHON_LIBRARIES}
+                            ${SHIBOKEN_LIBRARY}
+                            ${QT_QTWEBKIT_LIBRARY}
+                            ${QT_QTNETWORK_LIBRARY}
+                            ${QT_QTGUI_LIBRARY})
+set(QtWebKit_deps QtGui QtNetwork)
+create_pyside_module(QtWebKit
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_webkit.xml
+                     QtWebkit_include_dirs
+                     QtWebKit_libraries
+                     QtWebKit_deps
+                     QtWebKit_typesystem_path
+                     QtWebKit_SRC)
 
diff --git a/PySide/QtXml/CMakeLists.txt b/PySide/QtXml/CMakeLists.txt
index fc7b0d0d1..c76cabd68 100644
--- a/PySide/QtXml/CMakeLists.txt
+++ b/PySide/QtXml/CMakeLists.txt
@@ -35,34 +35,26 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/qxmlreader_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/qxmlsimplereader_wrapper.cpp
 )
 
-execute_generator(xml QtXml_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml
-                    ${CMAKE_SOURCE_DIR}
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTXML_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore
-                    )
-add_library(QtXml MODULE ${QtXml_SRC})
-set_property(TARGET QtXml PROPERTY PREFIX "")
-target_link_libraries(QtXml
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTXML_LIBRARY}
-                      )
-add_dependencies(QtXml QtCore)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml${CMAKE_DEBUG_POSTFIX}.so DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/pyside_qtxml_python.h
-        DESTINATION include/PySide/QtXml/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_xml.xml
-        DESTINATION share/PySide/typesystems)
-
-
+set(QtXml_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
+set(QtXml_include_dirs      ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml
+                            ${CMAKE_SOURCE_DIR}
+                            ${QT_INCLUDE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTXML_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${PYTHON_INCLUDE_PATH}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore)
+set(QtXml_libraries         pyside
+                            ${PYSIDE_PYTHON_LIBRARIES}
+                            ${SHIBOKEN_LIBRARY}
+                            ${QT_QTXML_LIBRARY})
+set(QtXml_deps QtCore)
+create_pyside_module(QtXml
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_xml.xml
+                     QtXml_include_dirs
+                     QtXml_libraries
+                     QtXml_deps
+                     QtXml_typesystem_path
+                     QtXml_SRC)
diff --git a/PySide/QtXmlPatterns/CMakeLists.txt b/PySide/QtXmlPatterns/CMakeLists.txt
index 825011fda..3456e9edc 100644
--- a/PySide/QtXmlPatterns/CMakeLists.txt
+++ b/PySide/QtXmlPatterns/CMakeLists.txt
@@ -26,30 +26,25 @@ set(QtXmlPatterns_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns/qxmlserializer_wrapper.cpp
     ${QtXmlPatterns_46_SRC}
 )
-
-execute_generator(xmlpatterns QtXmlPatterns_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTXMLPATTERNS_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns)
-add_library(QtXmlPatterns MODULE ${QtXmlPatterns_SRC})
-set_target_properties(QtXmlPatterns PROPERTIES PREFIX "")
-target_link_libraries(QtXmlPatterns
-                      pyside
-                      ${PYSIDE_PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTXMLPATTERNS_LIBRARY})
-add_dependencies(QtXmlPatterns QtCore)
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXmlPatterns${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns/pyside_qtxmlpatterns_python.h
-        DESTINATION include/PySide/QtXmlPatterns/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_xmlpatterns.xml
-        DESTINATION share/PySide/typesystems)
+set(QtXmlPatterns_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
+set(QtXmlPatterns_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                                ${QT_QTCORE_INCLUDE_DIR}
+                                ${QT_QTXMLPATTERNS_INCLUDE_DIR}
+                                ${PYTHON_INCLUDE_PATH}
+                                ${SHIBOKEN_INCLUDE_DIR}
+                                ${libpyside_SOURCE_DIR}
+                                ${QtCore_BINARY_DIR}/PySide/QtCore/
+                                ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns)
+set(QtXmlPatterns_libraries     pyside
+                                ${PYSIDE_PYTHON_LIBRARIES}
+                                ${QT_QTCORE_LIBRARY}
+                                ${QT_QTXMLPATTERNS_LIBRARY})
+set(QtXmlPatterns_deps QtCore)
+create_pyside_module(QtXmlPatterns
+                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_xmlpatterns.xml
+                     QtXmlPatterns_include_dirs
+                     QtXmlPatterns_libraries
+                     QtXmlPatterns_deps
+                     QtXmlPatterns_typesystem_path
+                     QtXmlPatterns_SRC)
 
diff --git a/PySide/phonon/CMakeLists.txt b/PySide/phonon/CMakeLists.txt
index b46304abb..062f17d7d 100644
--- a/PySide/phonon/CMakeLists.txt
+++ b/PySide/phonon/CMakeLists.txt
@@ -43,34 +43,28 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_volumeslider_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_backendcapabilities_notifierwrapper_wrapper.cpp
 )
-
-execute_generator(phonon phonon_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${phonon_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_PHONON_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon)
-add_library(phonon MODULE ${phonon_SRC})
-set_target_properties(phonon PROPERTIES PREFIX "")
-target_link_libraries(phonon
-                      pyside
+set(phonon_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${phonon_SOURCE_DIR}")
+set(phonon_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_PHONON_INCLUDE_DIR}
+                        ${PYTHON_INCLUDE_PATH}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon)
+set(phonon_libraries  pyside
                       ${PYSIDE_PYTHON_LIBRARIES}
                       ${QT_QTCORE_LIBRARY}
                       ${QT_QTGUI_LIBRARY}
                       ${QT_PHONON_LIBRARY})
-add_dependencies(phonon QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/pyside_phonon_python.h
-        DESTINATION include/PySide/phonon/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_phonon.xml
-        DESTINATION share/PySide/typesystems)
+set(phonon_deps QtGui)
 
+create_pyside_module(phonon
+                     "typesystem_phonon.xml"
+                     phonon_include_dirs
+                     phonon_libraries
+                     phonon_depend
+                     phonon_typesystem_path
+                     phonon_SRC)