Changeset 258412 in webkit
- Timestamp:
- Mar 13, 2020 11:10:58 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r258361 r258412 1 2020-03-13 Konstantin Tokarev <annulen@yandex.ru> 2 3 [CMake] Eleminate mismatches between Find* module names and variables they set 4 https://bugs.webkit.org/show_bug.cgi?id=208948 5 6 Reviewed by Michael Catanzaro. 7 8 * Source/cmake/FindLibseccomp.cmake: 9 * Source/cmake/FindWPEBackend_fdo.cmake: Renamed from Source/cmake/FindWPEBackend-fdo.cmake. 10 * Source/cmake/OptionsGTK.cmake: 11 * Source/cmake/OptionsWPE.cmake: 12 1 13 2020-03-12 Konstantin Tokarev <annulen@yandex.ru> 2 14 -
trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt
r252481 r258412 2 2 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") 3 3 4 find_package( Vpx 1.7.0)4 find_package(LibVpx 1.7.0) 5 5 if (NOT LIBVPX_FOUND) 6 6 message(FATAL_ERROR "libvpx is needed for USE_LIBWEBRTC.") … … 17 17 endif () 18 18 19 find_package( Opus 1.3)19 find_package(LibOpus 1.3) 20 20 if (NOT LIBOPUS_FOUND) 21 21 message(FATAL_ERROR "libopus is needed for USE_LIBWEBRTC.") … … 1552 1552 ) 1553 1553 1554 target_link_libraries(webrtc ${ VPX_LIBRARY})1555 1556 target_link_libraries(webrtc ${ EVENT_LIBRARY})1557 1558 target_link_libraries(webrtc ${ OPUS_LIBRARY})1554 target_link_libraries(webrtc ${LIBVPX_LIBRARY}) 1555 1556 target_link_libraries(webrtc ${LIBEVENT_LIBRARY}) 1557 1558 target_link_libraries(webrtc ${LIBOPUS_LIBRARY}) 1559 1559 1560 1560 # libsrtp package compilation -
trunk/Source/ThirdParty/libwebrtc/ChangeLog
r257755 r258412 1 2020-03-13 Konstantin Tokarev <annulen@yandex.ru> 2 3 [CMake] Eleminate mismatches between Find* module names and variables they set 4 https://bugs.webkit.org/show_bug.cgi?id=208948 5 6 Reviewed by Michael Catanzaro. 7 8 * CMakeLists.txt: 9 * cmake/FindAlsaLib.cmake: 10 * cmake/FindLibEvent.cmake: 11 * cmake/FindLibOpus.cmake: Renamed from Source/ThirdParty/libwebrtc/cmake/FindOpus.cmake. 12 * cmake/FindLibVpx.cmake: Renamed from Source/ThirdParty/libwebrtc/cmake/FindVpx.cmake. 13 1 14 2020-03-02 Alan Coon <alancoon@apple.com> 2 15 -
trunk/Source/ThirdParty/libwebrtc/cmake/FindAlsaLib.cmake
r230297 r258412 31 31 32 32 include(FindPackageHandleStandardArgs) 33 find_package_handle_standard_args(Alsa lib DEFAULT_MSG PC_ALSALIB_VERSION)33 find_package_handle_standard_args(AlsaLib DEFAULT_MSG PC_ALSALIB_VERSION) -
trunk/Source/ThirdParty/libwebrtc/cmake/FindLibEvent.cmake
r230297 r258412 3 3 # 4 4 # LIBEVENT_FOUND - system has libevent. 5 # EVENT_LIBRARY - link this to use libevent.5 # LIBEVENT_LIBRARY - link this to use libevent. 6 6 # 7 7 # Copyright (C) 2018 Igalia S.L. … … 31 31 pkg_check_modules(PC_LIBEVENT libevent) 32 32 33 find_library( EVENT_LIBRARY33 find_library(LIBEVENT_LIBRARY 34 34 NAME event 35 35 HINTS ${PC_LIBEVENT_LIBDIR} … … 38 38 include(FindPackageHandleStandardArgs) 39 39 find_package_handle_standard_args(LibEvent 40 REQUIRED_VARS EVENT_LIBRARY40 REQUIRED_VARS LIBEVENT_LIBRARY 41 41 FOUND_VAR LIBEVENT_FOUND 42 42 VERSION_VAR PC_LIBEVENT_VERSION) 43 43 44 44 mark_as_advanced( 45 EVENT_LIBRARY45 LIBEVENT_LIBRARY 46 46 ) -
trunk/Source/ThirdParty/libwebrtc/cmake/FindLibOpus.cmake
r258411 r258412 3 3 # 4 4 # LIBOPUS_FOUND - system has opus. 5 # OPUS_LIBRARY - link this to use opus.5 # LIBOPUS_LIBRARY - link this to use opus. 6 6 # 7 7 # Copyright (C) 2018 Igalia S.L. … … 31 31 pkg_check_modules(PC_LIBOPUS opus) 32 32 33 find_library( OPUS_LIBRARY33 find_library(LIBOPUS_LIBRARY 34 34 NAME opus 35 35 HINTS ${PC_LIBOPUS_LIBDIR} … … 38 38 include(FindPackageHandleStandardArgs) 39 39 find_package_handle_standard_args(LibOpus 40 REQUIRED_VARS OPUS_LIBRARY40 REQUIRED_VARS LIBOPUS_LIBRARY 41 41 FOUND_VAR LIBOPUS_FOUND 42 42 VERSION_VAR PC_LIBOPUS_VERSION) 43 43 44 44 mark_as_advanced( 45 OPUS_LIBRARY45 LIBOPUS_LIBRARY 46 46 ) -
trunk/Source/ThirdParty/libwebrtc/cmake/FindLibVpx.cmake
r258411 r258412 3 3 # 4 4 # LIBVPX_FOUND - system has libvpx. 5 # VPX_LIBRARY - link this to use libvpx.5 # LIBVPX_LIBRARY - link this to use libvpx. 6 6 # 7 7 # Copyright (C) 2018 Igalia S.L. … … 31 31 pkg_check_modules(PC_LIBVPX vpx) 32 32 33 find_library( VPX_LIBRARY33 find_library(LIBVPX_LIBRARY 34 34 NAME vpx 35 35 HINTS ${PC_LIBVPX_LIBDIR} … … 38 38 include(FindPackageHandleStandardArgs) 39 39 find_package_handle_standard_args(LibVpx 40 REQUIRED_VARS VPX_LIBRARY40 REQUIRED_VARS LIBVPX_LIBRARY 41 41 FOUND_VAR LIBVPX_FOUND 42 42 VERSION_VAR PC_LIBVPX_VERSION) 43 43 44 44 mark_as_advanced( 45 VPX_LIBRARY45 LIBVPX_LIBRARY 46 46 ) -
trunk/Source/cmake/FindLibseccomp.cmake
r258361 r258412 43 43 44 44 include(FindPackageHandleStandardArgs) 45 find_package_handle_standard_args(L IBSECCOMP45 find_package_handle_standard_args(Libseccomp 46 46 REQUIRED_VARS LIBSECCOMP_LIBRARIES 47 47 FOUND_VAR LIBSECCOMP_FOUND -
trunk/Source/cmake/FindWPEBackend_fdo.cmake
r258411 r258412 45 45 46 46 include(FindPackageHandleStandardArgs) 47 find_package_handle_standard_args(WPEBACKEND_FDO REQUIRED_VARS WPEBACKEND_FDO_INCLUDE_DIRS WPEBACKEND_FDO_LIBRARIES) 47 find_package_handle_standard_args(WPEBackend_fdo 48 REQUIRED_VARS WPEBACKEND_FDO_INCLUDE_DIRS WPEBACKEND_FDO_LIBRARIES 49 FOUND_VAR WPEBACKEND_FDO_FOUND 50 VERSION_VAR PC_WPEBACKEND_FDO_VERSION) -
trunk/Source/cmake/OptionsGTK.cmake
r258148 r258412 219 219 endif () 220 220 221 find_package(WPEBackend -fdo 1.3.1)221 find_package(WPEBackend_fdo 1.3.1) 222 222 if (NOT WPEBACKEND_FDO_FOUND) 223 223 message(FATAL_ERROR "WPEBackend-fdo is required for USE_WPE_RENDERER") -
trunk/Source/cmake/OptionsWPE.cmake
r258148 r258412 169 169 170 170 if (ENABLE_WPE_QT_API OR USE_WPE_VIDEO_PLANE_DISPLAY_DMABUF) 171 find_package(WPEBackend -fdo 1.5.0 REQUIRED)171 find_package(WPEBackend_fdo 1.5.0 REQUIRED) 172 172 endif () 173 173 -
trunk/Tools/ChangeLog
r258407 r258412 1 2020-03-13 Konstantin Tokarev <annulen@yandex.ru> 2 3 [CMake] Eleminate mismatches between Find* module names and variables they set 4 https://bugs.webkit.org/show_bug.cgi?id=208948 5 6 Reviewed by Michael Catanzaro. 7 8 * wpe/backends/CMakeLists.txt: 9 1 10 2020-03-13 Aakash Jain <aakash_jain@apple.com> 2 11 -
trunk/Tools/wpe/backends/CMakeLists.txt
r257053 r258412 2 2 find_package(Wayland REQUIRED) 3 3 find_package(WaylandProtocols 1.12 REQUIRED) 4 find_package(WPEBackend -fdo 1.3.0 REQUIRED)4 find_package(WPEBackend_fdo 1.3.0 REQUIRED) 5 5 6 6 set(DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends")
Note: See TracChangeset
for help on using the changeset viewer.