Changeset 220595 in webkit


Ignore:
Timestamp:
Aug 11, 2017 9:39:14 AM (7 years ago)
Author:
Konstantin Tokarev
Message:

[CMake] Fix broken use of REQUIRED with find modules
​https://bugs.webkit.org/show_bug.cgi?id=175427

Reviewed by Michael Catanzaro.

Module name passed to find_package_handle_standard_args() must exactly
match file name of CMake find module including letter case, e.g. "WebP"
must be used in FindWebP.cmake file. Otherwise find_package() arguments
(REQUIRED, QUIET, version) are not processed correctly.

To continue using old XXX_FOUND variables without case changes porting
to new find_package_handle_standard_args syntax which has FOUND_VAR
parameter. Unfortunately, variable name GTK_UNIX_PRINT_FOUND is not
allowed by find_package_handle_standard_args when package name is
GTKUnixPrint, so it's replaced to GTKUnixPrint_FOUND (default).

  • Source/cmake/FindGTKUnixPrint.cmake:
  • Source/cmake/FindGeoClue2.cmake:
  • Source/cmake/FindHyphen.cmake:
  • Source/cmake/FindLibEpoxy.cmake:
  • Source/cmake/FindLibGBM.cmake:
  • Source/cmake/FindLibsecret.cmake:
  • Source/cmake/FindLibtasn1.cmake:
  • Source/cmake/FindLibxkbcommon.cmake:
  • Source/cmake/FindOpenGL.cmake:
  • Source/cmake/FindOpenGLES2.cmake:
  • Source/cmake/FindOpenWebRTC.cmake:
  • Source/cmake/FindWPEBackend-mesa.cmake:
  • Source/cmake/FindWPEBackend.cmake:
  • Source/cmake/FindWayland.cmake:
  • Source/cmake/FindWebP.cmake:
  • Source/cmake/OptionsGTK.cmake:
Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r220540 r220595  
     12017-08-11  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [CMake] Fix broken use of REQUIRED with find modules
     4        https://bugs.webkit.org/show_bug.cgi?id=175427
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Module name passed to find_package_handle_standard_args() must exactly
     9        match file name of CMake find module including letter case, e.g. "WebP"
     10        must be used in FindWebP.cmake file. Otherwise find_package() arguments
     11        (REQUIRED, QUIET, version) are not processed correctly.
     12
     13        To continue using old XXX_FOUND variables without case changes porting
     14        to new find_package_handle_standard_args syntax which has FOUND_VAR
     15        parameter. Unfortunately, variable name GTK_UNIX_PRINT_FOUND is not
     16        allowed by find_package_handle_standard_args when package name is
     17        GTKUnixPrint, so it's replaced to GTKUnixPrint_FOUND (default).
     18
     19        * Source/cmake/FindGTKUnixPrint.cmake:
     20        * Source/cmake/FindGeoClue2.cmake:
     21        * Source/cmake/FindHyphen.cmake:
     22        * Source/cmake/FindLibEpoxy.cmake:
     23        * Source/cmake/FindLibGBM.cmake:
     24        * Source/cmake/FindLibsecret.cmake:
     25        * Source/cmake/FindLibtasn1.cmake:
     26        * Source/cmake/FindLibxkbcommon.cmake:
     27        * Source/cmake/FindOpenGL.cmake:
     28        * Source/cmake/FindOpenGLES2.cmake:
     29        * Source/cmake/FindOpenWebRTC.cmake:
     30        * Source/cmake/FindWPEBackend-mesa.cmake:
     31        * Source/cmake/FindWPEBackend.cmake:
     32        * Source/cmake/FindWayland.cmake:
     33        * Source/cmake/FindWebP.cmake:
     34        * Source/cmake/OptionsGTK.cmake:
     35
    1362017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
    237

  • trunk/Source/cmake/FindGTKUnixPrint.cmake

    r165737 r220595  
    22# Once done, this will define
    33#
    4 #  GTK_UNIX_PRINT_FOUND - system has gtk-unix-print
     4#  GTKUnixPrint_FOUND - system has gtk-unix-print
    55#  GTK_UNIX_PRINT_INCLUDE_DIRS - the gtk-unix-print include directories
    66#  GTK_UNIX_PRINT_LIBRARIES - link these to use gtk-unix-print
    … …  
    4747
    4848include(FindPackageHandleStandardArgs)
    49 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK_UNIX_PRINT DEFAULT_MSG GTK_UNIX_PRINT_INCLUDE_DIRS GTK_UNIX_PRINT_LIBRARIES VERSION_OK)
     49find_package_handle_standard_args(GTKUnixPrint REQUIRED_VARS GTK_UNIX_PRINT_INCLUDE_DIRS GTK_UNIX_PRINT_LIBRARIES VERSION_OK)

  • trunk/Source/cmake/FindGeoClue2.cmake

    r220540 r220595  
    4747
    4848include(FindPackageHandleStandardArgs)
    49 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOCLUE2 DEFAULT_MSG VERSION_OK)
     49find_package_handle_standard_args(GeoClue2 REQUIRED_VARS VERSION_OK
     50                                  FOUND_VAR GEOCLUE2_FOUND)

  • trunk/Source/cmake/FindHyphen.cmake

    r183584 r220595  
    3535
    3636include(FindPackageHandleStandardArgs)
    37 FIND_PACKAGE_HANDLE_STANDARD_ARGS(HYPHEN DEFAULT_MSG HYPHEN_INCLUDE_DIR HYPHEN_LIBRARIES)
     37find_package_handle_standard_args(Hyphen REQUIRED_VARS HYPHEN_INCLUDE_DIR HYPHEN_LIBRARIES
     38                                  FOUND_VAR HYPHEN_FOUND)
    3839
    3940if (HYPHEN_INCLUDE_DIR AND HYPHEN_LIBRARIES)

  • trunk/Source/cmake/FindLibEpoxy.cmake

    r219820 r220595  
    4444
    4545include(FindPackageHandleStandardArgs)
    46 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBEPOXY REQUIRED_VARS LIBEPOXY_INCLUDE_DIRS LIBEPOXY_LIBRARIES
     46find_package_handle_standard_args(LibEpoxy REQUIRED_VARS LIBEPOXY_INCLUDE_DIRS LIBEPOXY_LIBRARIES
    4747                                           VERSION_VAR   PC_LIBEPOXY_VERSION)

  • trunk/Source/cmake/FindLibGBM.cmake

    r216497 r220595  
    4242
    4343include(FindPackageHandleStandardArgs)
    44 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGBM DEFAULT_MSG LIBGBM_LIBRARIES)
     44find_package_handle_standard_args(LibGBM REQUIRED_VARS LIBGBM_LIBRARIES
     45                                  FOUND_VAR LIBGBM_FOUND)
    4546
    4647mark_as_advanced(LIBGBM_INCLUDE_DIRS LIBGBM_LIBRARIES)

  • trunk/Source/cmake/FindLibsecret.cmake

    r165738 r220595  
    4747
    4848include(FindPackageHandleStandardArgs)
    49 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSECRET DEFAULT_MSG LIBSECRET_INCLUDE_DIRS LIBSECRET_LIBRARIES VERSION_OK)
     49find_package_handle_standard_args(Libsecret REQUIRED_VARS LIBSECRET_INCLUDE_DIRS LIBSECRET_LIBRARIES VERSION_OK
     50                                  FOUND_VAR LIBSECRET_FOUND)

  • trunk/Source/cmake/FindLibtasn1.cmake

    r218626 r220595  
    4343
    4444include(FindPackageHandleStandardArgs)
    45 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBTASN1 DEFAULT_MSG LIBTASN1_LIBRARIES)
     45find_package_handle_standard_args(Libtasn1 REQUIRED_VARS LIBTASN1_LIBRARIES
     46                                  FOUND_VAR LIBTASN1_FOUND)
    4647
    4748mark_as_advanced(LIBTASN1_INCLUDE_DIRS LIBTASN1_LIBRARIES)

  • trunk/Source/cmake/FindLibxkbcommon.cmake

    r220000 r220595  
    3333
    3434include(FindPackageHandleStandardArgs)
    35 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBXKBCOMMON DEFAULT_MSG LIBXKBCOMMON_FOUND)
     35find_package_handle_standard_args(Libxkbcommon REQUIRED_VARS LIBXKBCOMMON_FOUND
     36                                  FOUND_VAR LIBXKBCOMMON_FOUND)

  • trunk/Source/cmake/FindOpenGL.cmake

    r191042 r220595  
    4949
    5050include(FindPackageHandleStandardArgs)
    51 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENGL DEFAULT_MSG OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES)
     51find_package_handle_standard_args(OpenGL REQUIRED_VARS OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES
     52                                  FOUND_VAR OPENGL_FOUND)
    5253
    5354mark_as_advanced(OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES)

  • trunk/Source/cmake/FindOpenGLES2.cmake

    r184954 r220595  
    2323
    2424include(FindPackageHandleStandardArgs)
    25 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENGLES2 DEFAULT_MSG OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES)
     25find_package_handle_standard_args(OpenGLES2 REQUIRED_VARS OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES
     26                                  FOUND_VAR OPENGLES2_FOUND)
    2627
    2728mark_as_advanced(OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES)

  • trunk/Source/cmake/FindOpenWebRTC.cmake

    r215221 r220595  
    6868
    6969include(FindPackageHandleStandardArgs)
    70 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENWEBRTC DEFAULT_MSG OPENWEBRTC_INCLUDE_DIRS OPENWEBRTC_LIBRARIES VERSION_OK)
     70find_package_handle_standard_args(OpenWebRTC REQUIRED_VARS OPENWEBRTC_INCLUDE_DIRS OPENWEBRTC_LIBRARIES VERSION_OK
     71                                  FOUND_VAR OPENWEBRTC_FOUND)

  • trunk/Source/cmake/FindWPEBackend-mesa.cmake

    r216497 r220595  
    4545
    4646include(FindPackageHandleStandardArgs)
    47 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPE_MESA REQUIRED_VARS WPE_MESA_INCLUDE_DIRS WPE_MESA_LIBRARIES)
     47find_package_handle_standard_args(WPEBackend-mesa REQUIRED_VARS WPE_MESA_INCLUDE_DIRS WPE_MESA_LIBRARIES)

  • trunk/Source/cmake/FindWPEBackend.cmake

    r216497 r220595  
    4545
    4646include(FindPackageHandleStandardArgs)
    47 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPE REQUIRED_VARS WPE_INCLUDE_DIRS WPE_LIBRARIES)
     47find_package_handle_standard_args(WPEBackend REQUIRED_VARS WPE_INCLUDE_DIRS WPE_LIBRARIES)

  • trunk/Source/cmake/FindWayland.cmake

    r173618 r220595  
    3333
    3434include(FindPackageHandleStandardArgs)
    35 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND DEFAULT_MSG WAYLAND_LIBRARIES)
     35find_package_handle_standard_args(Wayland REQUIRED_VARS WAYLAND_LIBRARIES
     36                                  FOUND_VAR WAYLAND_FOUND)

  • trunk/Source/cmake/FindWebP.cmake

    r199518 r220595  
    4949
    5050include(FindPackageHandleStandardArgs)
    51 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WEBP DEFAULT_MSG WEBP_INCLUDE_DIRS WEBP_LIBRARIES)
     51find_package_handle_standard_args(WebP REQUIRED_VARS WEBP_INCLUDE_DIRS WEBP_LIBRARIES
     52                                  FOUND_VAR WEBP_FOUND)

  • trunk/Source/cmake/OptionsGTK.cmake

    r220532 r220595  
    205205
    206206SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_GESTURES ${GTK3_SUPPORTS_GESTURES})
    207 SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTK_UNIX_PRINT_FOUND})
     207SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTKUnixPrint_FOUND})
    208208
    209209set(glib_components gio gio-unix gobject gthread gmodule)
Note: See TracChangeset for help on using the changeset viewer.