Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: use correct media sources in WXQT build

Browse Source 
Only check for gstreamer in Unix GTK builds.

Closes #18945
This commit is contained in:
Maarten Bent
2020-10-18 14:51:37 +02:00
parent 6862cdd0cd
commit 0417dabdbd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/init.cmake
View File

@@ -447,7 +447,7 @@ if(wxUSE_GUI)
endif() endif()
endif() endif()
if(wxUSE_MEDIACTRL AND UNIX AND NOT APPLE AND NOT WIN32) if(wxUSE_MEDIACTRL AND WXGTK AND NOT APPLE AND NOT WIN32)
find_package(GSTREAMER 1.0 COMPONENTS video) find_package(GSTREAMER 1.0 COMPONENTS video)
if(NOT GSTREAMER_FOUND) if(NOT GSTREAMER_FOUND)
find_package(GSTREAMER 0.10 COMPONENTS interfaces) find_package(GSTREAMER 0.10 COMPONENTS interfaces)

4
build/cmake/lib/media/CMakeLists.txt
View File

@@ -17,7 +17,7 @@ elseif(WXOSX_COCOA)
wx_append_sources(MEDIA_FILES MEDIA_OSX_COCOA) wx_append_sources(MEDIA_FILES MEDIA_OSX_COCOA)
elseif(WXOSX_IPHONE) elseif(WXOSX_IPHONE)
wx_append_sources(MEDIA_FILES MEDIA_OSX_IPHONE) wx_append_sources(MEDIA_FILES MEDIA_OSX_IPHONE)
elseif(UNIX) elseif(WXGTK)
wx_append_sources(MEDIA_FILES MEDIA_UNIX) wx_append_sources(MEDIA_FILES MEDIA_UNIX)
elseif(WXQT) elseif(WXQT)
wx_append_sources(MEDIA_FILES MEDIA_QT) wx_append_sources(MEDIA_FILES MEDIA_QT)
@@ -30,7 +30,7 @@ if(WXOSX)
"-framework CoreMedia" "-framework CoreMedia"
"-weak_framework AVKit" "-weak_framework AVKit"
) )
elseif(UNIX) elseif(WXGTK)
wx_lib_include_directories(wxmedia PUBLIC ${GSTREAMER_INCLUDE_DIRS}) wx_lib_include_directories(wxmedia PUBLIC ${GSTREAMER_INCLUDE_DIRS})
if(GSTREAMER_INTERFACES_INCLUDE_DIRS) if(GSTREAMER_INTERFACES_INCLUDE_DIRS)
wx_lib_include_directories(wxmedia PUBLIC ${GSTREAMER_INTERFACES_INCLUDE_DIRS}) wx_lib_include_directories(wxmedia PUBLIC ${GSTREAMER_INTERFACES_INCLUDE_DIRS})