Changeset 230297 in webkit

Timestamp:

Apr 5, 2018 1:00:49 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Add CMake package search for vpx and libevent libraries
​https://bugs.webkit.org/show_bug.cgi?id=184257

Patch by Alejandro G. Castro <​alex@igalia.com> on 2018-04-05
Reviewed by Michael Catanzaro.

Add new cmake search files for libevent, vpx and alsa-lib, this
makes a cleaner detection of the libraries.

• CMakeLists.txt: Use the new cmake find files to detect the

package and add a better error message when the library is not
there.

• Source/cmake/FindAlsaLib.cmake: Added.
• Source/cmake/FindLibEvent.cmake: Added.
• Source/cmake/FindVpx.cmake: Added.

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• cmake (added)
• cmake/FindAlsaLib.cmake (added)
• cmake/FindLibEvent.cmake (added)
• cmake/FindVpx.cmake (added)

trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt

@@ -1 +1 @@
 
-find_library(VPX_LIBRARY vpx)
-find_library(EVENT_LIBRARY event)
+set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+find_package(Vpx 1.7.0)
+if (NOT LIBVPX_FOUND)
+    message(FATAL_ERROR "libvpx is needed for USE_LIBWEBRTC.")
+endif ()
+
+find_package(LibEvent)
+if (NOT LIBEVENT_FOUND)
+    message(FATAL_ERROR "libevent is needed for USE_LIBWEBRTC.")
+endif ()
+
+find_package(AlsaLib)
+if (NOT ALSALIB_FOUND)
+    message(FATAL_ERROR "alsa-lib is needed for USE_LIBWEBRTC.")
+endif ()
 
 set(webrtc_SOURCES

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2018-04-05  Alejandro G. Castro  <alex@igalia.com>
+
+        [GTK] Add CMake package search for vpx and libevent libraries
+        https://bugs.webkit.org/show_bug.cgi?id=184257
+
+        Reviewed by Michael Catanzaro.
+
+        Add new cmake search files for libevent, vpx and alsa-lib, this
+        makes a cleaner detection of the libraries.
+
+        * CMakeLists.txt: Use the new cmake find files to detect the
+        package and add a better error message when the library is not
+        there.
+        * Source/cmake/FindAlsaLib.cmake: Added.
+        * Source/cmake/FindLibEvent.cmake: Added.
+        * Source/cmake/FindVpx.cmake: Added.
+
 2018-04-03  Youenn Fablet  <youenn@apple.com>