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

Merge branch 'cmake-fixes' of https://github.com/MaartenBent/wxWidgets

Browse Source 
Fix wxQt and wxGTK2 build problems.

See https://github.com/wxWidgets/wxWidgets/pull/2094
This commit is contained in:
Vadim Zeitlin 2020-10-18 23:34:12 +02:00
commit 52fdc8c97d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/init.cmake
View File

@ -397,7 +397,7 @@ if(wxUSE_GUI)
message(WARNING "opengl not found, wxGLCanvas won't be available")
wx_option_force_value(wxUSE_OPENGL OFF)
endif()
if(UNIX AND NOT OpenGL_EGL_FOUND)
if(UNIX AND (NOT WXGTK3 OR NOT OpenGL_EGL_FOUND))
wx_option_force_value(wxUSE_GLCANVAS_EGL OFF)
endif()
endif()
@ -447,7 +447,7 @@ if(wxUSE_GUI)
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)
if(NOT GSTREAMER_FOUND)
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)
elseif(WXOSX_IPHONE)
wx_append_sources(MEDIA_FILES MEDIA_OSX_IPHONE)
elseif(UNIX)
elseif(WXGTK)
wx_append_sources(MEDIA_FILES MEDIA_UNIX)
elseif(WXQT)
wx_append_sources(MEDIA_FILES MEDIA_QT)
@ -30,7 +30,7 @@ if(WXOSX)
"-framework CoreMedia"
"-weak_framework AVKit"
)
elseif(UNIX)
elseif(WXGTK)
wx_lib_include_directories(wxmedia PUBLIC ${GSTREAMER_INCLUDE_DIRS})
if(GSTREAMER_INTERFACES_INCLUDE_DIRS)
wx_lib_include_directories(wxmedia PUBLIC ${GSTREAMER_INTERFACES_INCLUDE_DIRS})