Changeset 258412 in webkit


Ignore:
Timestamp:
Mar 13, 2020 11:10:58 AM (4 years ago)
Author:
Konstantin Tokarev
Message:

[CMake] Eleminate mismatches between Find* module names and variables they set
https://bugs.webkit.org/show_bug.cgi?id=208948

Reviewed by Michael Catanzaro.

.:

  • Source/cmake/FindLibseccomp.cmake:
  • Source/cmake/FindWPEBackend_fdo.cmake: Renamed from Source/cmake/FindWPEBackend-fdo.cmake.
  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/OptionsWPE.cmake:

Source/ThirdParty/libwebrtc:

  • CMakeLists.txt:
  • cmake/FindAlsaLib.cmake:
  • cmake/FindLibEvent.cmake:
  • cmake/FindLibOpus.cmake: Renamed from Source/ThirdParty/libwebrtc/cmake/FindOpus.cmake.
  • cmake/FindLibVpx.cmake: Renamed from Source/ThirdParty/libwebrtc/cmake/FindVpx.cmake.

Tools:

  • wpe/backends/CMakeLists.txt:
Location:
trunk
Files:
10 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r258361 r258412  
     12020-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
    1132020-03-12  Konstantin Tokarev  <annulen@yandex.ru>
    214
  • trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt

    r252481 r258412  
    22set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
    33
    4 find_package(Vpx 1.7.0)
     4find_package(LibVpx 1.7.0)
    55if (NOT LIBVPX_FOUND)
    66    message(FATAL_ERROR "libvpx is needed for USE_LIBWEBRTC.")
     
    1717endif ()
    1818
    19 find_package(Opus 1.3)
     19find_package(LibOpus 1.3)
    2020if (NOT LIBOPUS_FOUND)
    2121    message(FATAL_ERROR "libopus is needed for USE_LIBWEBRTC.")
     
    15521552)
    15531553
    1554 target_link_libraries(webrtc ${VPX_LIBRARY})
    1555 
    1556 target_link_libraries(webrtc ${EVENT_LIBRARY})
    1557 
    1558 target_link_libraries(webrtc ${OPUS_LIBRARY})
     1554target_link_libraries(webrtc ${LIBVPX_LIBRARY})
     1555
     1556target_link_libraries(webrtc ${LIBEVENT_LIBRARY})
     1557
     1558target_link_libraries(webrtc ${LIBOPUS_LIBRARY})
    15591559
    15601560# libsrtp package compilation
  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r257755 r258412  
     12020-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
    1142020-03-02  Alan Coon  <alancoon@apple.com>
    215
  • trunk/Source/ThirdParty/libwebrtc/cmake/FindAlsaLib.cmake

    r230297 r258412  
    3131
    3232include(FindPackageHandleStandardArgs)
    33 find_package_handle_standard_args(Alsalib DEFAULT_MSG PC_ALSALIB_VERSION)
     33find_package_handle_standard_args(AlsaLib DEFAULT_MSG PC_ALSALIB_VERSION)
  • trunk/Source/ThirdParty/libwebrtc/cmake/FindLibEvent.cmake

    r230297 r258412  
    33#
    44#  LIBEVENT_FOUND - system has libevent.
    5 EVENT_LIBRARY - link this to use libevent.
     5LIBEVENT_LIBRARY - link this to use libevent.
    66#
    77# Copyright (C) 2018 Igalia S.L.
     
    3131pkg_check_modules(PC_LIBEVENT libevent)
    3232
    33 find_library(EVENT_LIBRARY
     33find_library(LIBEVENT_LIBRARY
    3434    NAME event
    3535    HINTS ${PC_LIBEVENT_LIBDIR}
     
    3838include(FindPackageHandleStandardArgs)
    3939find_package_handle_standard_args(LibEvent
    40     REQUIRED_VARS EVENT_LIBRARY
     40    REQUIRED_VARS LIBEVENT_LIBRARY
    4141    FOUND_VAR LIBEVENT_FOUND
    4242    VERSION_VAR PC_LIBEVENT_VERSION)
    4343
    4444mark_as_advanced(
    45     EVENT_LIBRARY
     45    LIBEVENT_LIBRARY
    4646)
  • trunk/Source/ThirdParty/libwebrtc/cmake/FindLibOpus.cmake

    r258411 r258412  
    33#
    44#  LIBOPUS_FOUND - system has opus.
    5 OPUS_LIBRARY - link this to use opus.
     5LIBOPUS_LIBRARY - link this to use opus.
    66#
    77# Copyright (C) 2018 Igalia S.L.
     
    3131pkg_check_modules(PC_LIBOPUS opus)
    3232
    33 find_library(OPUS_LIBRARY
     33find_library(LIBOPUS_LIBRARY
    3434    NAME opus
    3535    HINTS ${PC_LIBOPUS_LIBDIR}
     
    3838include(FindPackageHandleStandardArgs)
    3939find_package_handle_standard_args(LibOpus
    40     REQUIRED_VARS OPUS_LIBRARY
     40    REQUIRED_VARS LIBOPUS_LIBRARY
    4141    FOUND_VAR LIBOPUS_FOUND
    4242    VERSION_VAR PC_LIBOPUS_VERSION)
    4343
    4444mark_as_advanced(
    45     OPUS_LIBRARY
     45    LIBOPUS_LIBRARY
    4646)
  • trunk/Source/ThirdParty/libwebrtc/cmake/FindLibVpx.cmake

    r258411 r258412  
    33#
    44#  LIBVPX_FOUND - system has libvpx.
    5 VPX_LIBRARY - link this to use libvpx.
     5LIBVPX_LIBRARY - link this to use libvpx.
    66#
    77# Copyright (C) 2018 Igalia S.L.
     
    3131pkg_check_modules(PC_LIBVPX vpx)
    3232
    33 find_library(VPX_LIBRARY
     33find_library(LIBVPX_LIBRARY
    3434    NAME vpx
    3535    HINTS ${PC_LIBVPX_LIBDIR}
     
    3838include(FindPackageHandleStandardArgs)
    3939find_package_handle_standard_args(LibVpx
    40     REQUIRED_VARS VPX_LIBRARY
     40    REQUIRED_VARS LIBVPX_LIBRARY
    4141    FOUND_VAR LIBVPX_FOUND
    4242    VERSION_VAR PC_LIBVPX_VERSION)
    4343
    4444mark_as_advanced(
    45     VPX_LIBRARY
     45    LIBVPX_LIBRARY
    4646)
  • trunk/Source/cmake/FindLibseccomp.cmake

    r258361 r258412  
    4343
    4444include(FindPackageHandleStandardArgs)
    45 find_package_handle_standard_args(LIBSECCOMP
     45find_package_handle_standard_args(Libseccomp
    4646    REQUIRED_VARS LIBSECCOMP_LIBRARIES
    4747    FOUND_VAR LIBSECCOMP_FOUND
  • trunk/Source/cmake/FindWPEBackend_fdo.cmake

    r258411 r258412  
    4545
    4646include(FindPackageHandleStandardArgs)
    47 find_package_handle_standard_args(WPEBACKEND_FDO REQUIRED_VARS WPEBACKEND_FDO_INCLUDE_DIRS WPEBACKEND_FDO_LIBRARIES)
     47find_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  
    219219    endif ()
    220220
    221     find_package(WPEBackend-fdo 1.3.1)
     221    find_package(WPEBackend_fdo 1.3.1)
    222222    if (NOT WPEBACKEND_FDO_FOUND)
    223223        message(FATAL_ERROR "WPEBackend-fdo is required for USE_WPE_RENDERER")
  • trunk/Source/cmake/OptionsWPE.cmake

    r258148 r258412  
    169169
    170170if (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)
    172172endif ()
    173173
  • trunk/Tools/ChangeLog

    r258407 r258412  
     12020-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
    1102020-03-13  Aakash Jain  <aakash_jain@apple.com>
    211
  • trunk/Tools/wpe/backends/CMakeLists.txt

    r257053 r258412  
    22find_package(Wayland REQUIRED)
    33find_package(WaylandProtocols 1.12 REQUIRED)
    4 find_package(WPEBackend-fdo 1.3.0 REQUIRED)
     4find_package(WPEBackend_fdo 1.3.0 REQUIRED)
    55
    66set(DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends")
Note: See TracChangeset for help on using the changeset viewer.