diff options
| -rw-r--r-- | PySide/QtNetwork/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | PySide/QtScriptTools/CMakeLists.txt | 59 | ||||
| -rw-r--r-- | PySide/QtSvg/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | PySide/QtTest/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | PySide/QtWebKit/CMakeLists.txt | 12 |
5 files changed, 27 insertions, 81 deletions
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt index df3c12964..15504990d 100644 --- a/PySide/QtNetwork/CMakeLists.txt +++ b/PySide/QtNetwork/CMakeLists.txt @@ -34,19 +34,6 @@ macro(CHECK_QT_NETWORK_MACRO macro_display_name qt_macro module_sources global_s endmacro(CHECK_QT_NETWORK_MACRO) -if(Q_WS_X11) - set(MODULE_NAME network_x11) - set(SPECIFIC_OS_FILES - ) - -elseif(Q_WS_MAC) - set(MODULE_NAME network_mac) - set(SPECIFIC_OS_FILES - ) -else() - message(FATAL_ERROR "OS not supported") -endif(Q_WS_X11) - if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6) set (QtNetwork_47_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkconfiguration_wrapper.cpp diff --git a/PySide/QtScriptTools/CMakeLists.txt b/PySide/QtScriptTools/CMakeLists.txt index 22860b1d4..39faee45b 100644 --- a/PySide/QtScriptTools/CMakeLists.txt +++ b/PySide/QtScriptTools/CMakeLists.txt @@ -5,38 +5,33 @@ set(QtScriptTools_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/qscriptenginedebugger_wrapper.cpp ) -execute_generator(scripttools QtScriptTools_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtScript_SOURCE_DIR}:${QtScriptTools_SOURCE_DIR}") +set(QtScriptTools_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtScript_SOURCE_DIR}:${QtScriptTools_SOURCE_DIR}") -include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${QT_QTCORE_INCLUDE_DIR} - ${QT_GUI_INCLUDE_DIR} - ${QT_QTSCRIPT_INCLUDE_DIR} - ${QT_QTSCRIPTTOOLS_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} - ${SHIBOKEN_INCLUDE_DIR} - ${libpyside_SOURCE_DIR} - ${QtCore_BINARY_DIR}/PySide/QtCore/ - ${QtGui_BINARY_DIR}/PySide/QtGui/ - ${QtScript_BINARY_DIR}/PySide/QtScript/ - ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools) +set(QtScriptTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} + ${QT_QTCORE_INCLUDE_DIR} + ${QT_GUI_INCLUDE_DIR} + ${QT_QTSCRIPT_INCLUDE_DIR} + ${QT_QTSCRIPTTOOLS_INCLUDE_DIR} + ${PYTHON_INCLUDE_PATH} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${QtCore_BINARY_DIR}/PySide/QtCore/ + ${QtGui_BINARY_DIR}/PySide/QtGui/ + ${QtScript_BINARY_DIR}/PySide/QtScript/ + ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools) -add_library(QtScriptTools MODULE ${QtScriptTools_SRC}) -set_target_properties(QtScriptTools PROPERTIES PREFIX "") -target_link_libraries(QtScriptTools - pyside - ${PYSIDE_PYTHON_LIBRARIES} - ${QT_QTCORE_LIBRARY} - ${QT_GUI_LIBRARY} - ${QT_QTSCRIPT_LIBRARY} - ${QT_QTSCRIPTTOOLS_LIBRARY}) - -add_dependencies(QtScriptTools QtCore QtScript QtGui) - -# install -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScriptTools${CMAKE_DEBUG_POSTFIX}.so - DESTINATION ${SITE_PACKAGE}/PySide) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/pyside_qtscripttools_python.h - DESTINATION include/PySide/QtScriptTools/) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_scripttools.xml - DESTINATION share/PySide/typesystems) +set(QtScriptTools_libraries pyside + ${PYSIDE_PYTHON_LIBRARIES} + ${QT_QTCORE_LIBRARY} + ${QT_GUI_LIBRARY} + ${QT_QTSCRIPT_LIBRARY} + ${QT_QTSCRIPTTOOLS_LIBRARY}) +set(QtScriptTools_deps QtCore QtScript QtGui) +create_pyside_module(QtScriptTools + ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_scripttools.xml + QtScriptTools_include_dirs + QtScriptTools_libraries + QtScriptTools_deps + QtScriptTools_typesystem_path + QtScriptTools_SRC) diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt index 4119512ce..a56ee3382 100644 --- a/PySide/QtSvg/CMakeLists.txt +++ b/PySide/QtSvg/CMakeLists.txt @@ -1,17 +1,5 @@ project(QtSvg) -if(Q_WS_X11) - set(MODULE_NAME svg_x11) - set(SPECIFIC_OS_FILES - ) -elseif(Q_WS_MAC) - set(MODULE_NAME svg_mac) - set(SPECIFIC_OS_FILES - ) -else() - message(FATAL_ERROR "OS not supported") -endif(Q_WS_X11) - if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) set (QtSvg_46_SRC ) else () diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt index def84db80..4bf0bca25 100644 --- a/PySide/QtTest/CMakeLists.txt +++ b/PySide/QtTest/CMakeLists.txt @@ -1,17 +1,5 @@ project(QtTest) -if(Q_WS_X11) - set(MODULE_NAME test_x11) - set(SPECIFIC_OS_FILES - ) -elseif(Q_WS_MAC) - set(MODULE_NAME test_mac) - set(SPECIFIC_OS_FILES - ) -else() - message(FATAL_ERROR "OS not supported") -endif(Q_WS_X11) - set(QtTest_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt index 08e20be02..9039835b4 100644 --- a/PySide/QtWebKit/CMakeLists.txt +++ b/PySide/QtWebKit/CMakeLists.txt @@ -1,17 +1,5 @@ project(QtWebKit) -if(Q_WS_X11) - set(MODULE_NAME webkit_x11) - set(SPECIFIC_OS_FILES - ) -elseif(Q_WS_MAC) - set(MODULE_NAME webkit_mac) - set(SPECIFIC_OS_FILES - ) -else() - message(FATAL_ERROR "OS not supported") -endif(Q_WS_X11) - if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) set (QtWebKit_46_SRC ) else () |