highgui Wayland xdg_shell
-enable using -DWITH_WAYLAND=ON -adapted from https://github.com/pfpacket/opencv-wayland -using xdg_shell stable protocol -overrides HAVE_QT if HAVE_WAYLAND and WITH_WAYLAND are set Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Co-authored-by: Ryo Munakata <afpacket@gmail.com>
This commit is contained in:
committed by
Joel Winarske
parent
b19683eb41
commit
0769bf416f
@@ -58,6 +58,7 @@ inline void verify_size(const std::string &nm, const cv::Mat &img)
|
||||
&& !defined HAVE_QT \
|
||||
&& !defined HAVE_WIN32UI \
|
||||
&& !defined HAVE_COCOA \
|
||||
&& !defined HAVE_WAYLAND \
|
||||
)
|
||||
TEST(Highgui_GUI, DISABLED_regression)
|
||||
#else
|
||||
@@ -135,6 +136,7 @@ static void Foo(int, void* counter)
|
||||
&& !defined HAVE_GTK \
|
||||
&& !defined HAVE_QT \
|
||||
&& !defined HAVE_WIN32UI \
|
||||
&& !defined HAVE_WAYLAND \
|
||||
) \
|
||||
|| defined(__APPLE__) // test fails on Mac (cocoa)
|
||||
TEST(Highgui_GUI, DISABLED_trackbar_unsafe)
|
||||
@@ -174,6 +176,7 @@ void testTrackbarCallback(int pos, void* param)
|
||||
&& !defined HAVE_GTK \
|
||||
&& !defined HAVE_QT \
|
||||
&& !defined HAVE_WIN32UI \
|
||||
&& !defined HAVE_WAYLAND \
|
||||
) \
|
||||
|| defined(__APPLE__) // test fails on Mac (cocoa)
|
||||
TEST(Highgui_GUI, DISABLED_trackbar)
|
||||
|
||||
Reference in New Issue
Block a user