diff options
| author | Hugo Lima <hugo.lima@openbossa.org> | 2010-03-23 14:34:37 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.lima@openbossa.org> | 2010-04-12 17:30:01 -0300 |
| commit | 354b8b6cea7b3f8ae1c95d20d48c598da5c6cbdc (patch) | |
| tree | 713b1d82cfa7a5e82822f081543137e345c014ad /PySide/QtMultimedia | |
| parent | 3ddaabdefe113406be50447515fcf39cc058554a (diff) | |
QtMultimedia doesn't exists in versions prior to 4.6, so we dont need to check if we had Qt4.6 to add specific Qt4.6 files.
Diffstat (limited to 'PySide/QtMultimedia')
| -rw-r--r-- | PySide/QtMultimedia/CMakeLists.txt | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt index 223485480..ec8c1a64a 100644 --- a/PySide/QtMultimedia/CMakeLists.txt +++ b/PySide/QtMultimedia/CMakeLists.txt @@ -1,21 +1,6 @@ project(QtMultimedia) -if(Q_WS_X11) - set(MODULE_NAME multimedia_x11) - set(SPECIFIC_OS_FILES - ) -elseif(Q_WS_MAC) - set(MODULE_NAME multimedia_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 (QtMultimedia_46_SRC ) -else () - set(QtMultimedia_46_SRC +set(QtMultimedia_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qaudio_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qabstractvideobuffer_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qabstractvideosurface_wrapper.cpp @@ -26,12 +11,6 @@ else () ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qvideoframe_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qvideosurfaceformat_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qtmultimedia_module_wrapper.cpp - ) -endif (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) - -set(QtMultimedia_SRC -${SPECIFIC_OS_FILES} -${QtMultimedia_46_SRC} ) execute_generator(multimedia QtMultimedia_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}") |