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.
This commit is contained in:
parent
3ddaabdefe
commit
354b8b6cea
1 changed files with 1 additions and 22 deletions
|
|
@ -1,21 +1,6 @@
|
||||||
project(QtMultimedia)
|
project(QtMultimedia)
|
||||||
|
|
||||||
if(Q_WS_X11)
|
set(QtMultimedia_SRC
|
||||||
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
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qaudio_wrapper.cpp
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qaudio_wrapper.cpp
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qabstractvideobuffer_wrapper.cpp
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qabstractvideobuffer_wrapper.cpp
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qabstractvideosurface_wrapper.cpp
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qabstractvideosurface_wrapper.cpp
|
||||||
|
|
@ -27,12 +12,6 @@ else ()
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qvideosurfaceformat_wrapper.cpp
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qvideosurfaceformat_wrapper.cpp
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qtmultimedia_module_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}")
|
execute_generator(multimedia QtMultimedia_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue