SVN commit 1087015 by ahartmetz:
Do not refuse to build without libv4l2 because Kopete also works without v4l,
only the webcam part won't work. Note to bug reporters using source distros:
you should know what you're doing and understand dependencies.
It's also incosistent to depend on something that is really not essential
only when compiling on a specific platform. libv4l is also not easy to
impossible to compile on old kernels where the rest of Kopete works fine.
This reverts the last commit.
CCBUG: 166563,165357,195095
CCMAIL: [email protected],[email protected]
M +2 -8 CMakeLists.txt
--- trunk/KDE/kdenetwork/kopete/CMakeLists.txt #1087014:1087015
@@ -100,15 +100,9 @@
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")
-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_optional_find_package(LibV4L2)
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
