branches/KDE/4.4/kdenetwork/kopete

Frank Schaefer fschaefer.oss at googlemail.com
Thu Feb 18 16:11:56 CET 2010


SVN commit 1092225 by fschaefer:

Make libv4l mandatory on Linux

Too many devices are not working properly without it.
See discussion on the kopete-devel-mailinglist (Jan/Feb 2010).

Backport of r1092217

CCMAIL: kde-buildsystem at kde.org
CCBUG: 195095                  
CCBUG: 165357                  
CCBUG: 166563


 M  +8 -2      CMakeLists.txt  


--- branches/KDE/4.4/kdenetwork/kopete/CMakeLists.txt #1092224:1092225
@@ -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)


More information about the Kde-buildsystem mailing list