SVN commit 1086429 by fschaefer:

Make libv4l mandatory on Linux

Thanks to Raphael Kubo da Costa for his comments/suggestions.

CCMAIL: [email protected]
CCBUG: 195095
CCBUG: 165357
CCBUG: 166563


 M  +8 -2      CMakeLists.txt  


--- trunk/KDE/kdenetwork/kopete/CMakeLists.txt #1086428:1086429
@@ -100,9 +100,15 @@
 macro_bool_to_01(LIBGADU_FOUND HAVE_LIBGADU)
 macro_log_feature(LIBGADU_FOUND "libgadu" "A library providing support for 
Gadu-Gadu protocol" "http://toxygen.net/libgadu/"; FALSE "1.8.0" "Required for 
Kopete Gadu-Gadu protocol")
 
-macro_optional_find_package(LibV4L2)
+if (NOT WIN32)
+  set (LIBV4L2_REQUIRED FALSE)
+  if (CMAKE_SYSTEM_NAME MATCHES Linux)
+    set (LIBV4L2_REQUIRED TRUE)
+  endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+  find_package(LibV4L2)
+  macro_log_feature(LIBV4L2_FOUND "libv4l2" "Collection of video4linux support 
libraries" "http://hansdegoede.livejournal.com"; LIBV4L2_REQUIRED "" "Required 
for better webcam support")
+endif (NOT WIN32)
 macro_bool_to_01(LIBV4L2_FOUND HAVE_LIBV4L2)
-macro_log_feature(LIBV4L2_FOUND "libv4l2" "Collection of video4linux support 
libraries" "http://hansdegoede.livejournal.com/3636.html"; FALSE "" "Required 
for better webcam support")
 
 check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
 check_include_files(stdint.h HAVE_STDINT_H)
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem

Reply via email to