Changeset 220595 in webkit
- Timestamp:
- Aug 11, 2017 9:39:14 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r220540 r220595 1 2017-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 1 36 2017-08-10 Michael Catanzaro <mcatanzaro@igalia.com> 2 37 -
trunk/Source/cmake/FindGTKUnixPrint.cmake
r165737 r220595 2 2 # Once done, this will define 3 3 # 4 # GTK _UNIX_PRINT_FOUND - system has gtk-unix-print4 # GTKUnixPrint_FOUND - system has gtk-unix-print 5 5 # GTK_UNIX_PRINT_INCLUDE_DIRS - the gtk-unix-print include directories 6 6 # GTK_UNIX_PRINT_LIBRARIES - link these to use gtk-unix-print … … 47 47 48 48 include(FindPackageHandleStandardArgs) 49 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK_UNIX_PRINT DEFAULT_MSGGTK_UNIX_PRINT_INCLUDE_DIRS GTK_UNIX_PRINT_LIBRARIES VERSION_OK)49 find_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 47 47 48 48 include(FindPackageHandleStandardArgs) 49 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOCLUE2 DEFAULT_MSG VERSION_OK) 49 find_package_handle_standard_args(GeoClue2 REQUIRED_VARS VERSION_OK 50 FOUND_VAR GEOCLUE2_FOUND) -
trunk/Source/cmake/FindHyphen.cmake
r183584 r220595 35 35 36 36 include(FindPackageHandleStandardArgs) 37 FIND_PACKAGE_HANDLE_STANDARD_ARGS(HYPHEN DEFAULT_MSG HYPHEN_INCLUDE_DIR HYPHEN_LIBRARIES) 37 find_package_handle_standard_args(Hyphen REQUIRED_VARS HYPHEN_INCLUDE_DIR HYPHEN_LIBRARIES 38 FOUND_VAR HYPHEN_FOUND) 38 39 39 40 if (HYPHEN_INCLUDE_DIR AND HYPHEN_LIBRARIES) -
trunk/Source/cmake/FindLibEpoxy.cmake
r219820 r220595 44 44 45 45 include(FindPackageHandleStandardArgs) 46 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBEPOXYREQUIRED_VARS LIBEPOXY_INCLUDE_DIRS LIBEPOXY_LIBRARIES46 find_package_handle_standard_args(LibEpoxy REQUIRED_VARS LIBEPOXY_INCLUDE_DIRS LIBEPOXY_LIBRARIES 47 47 VERSION_VAR PC_LIBEPOXY_VERSION) -
trunk/Source/cmake/FindLibGBM.cmake
r216497 r220595 42 42 43 43 include(FindPackageHandleStandardArgs) 44 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGBM DEFAULT_MSG LIBGBM_LIBRARIES) 44 find_package_handle_standard_args(LibGBM REQUIRED_VARS LIBGBM_LIBRARIES 45 FOUND_VAR LIBGBM_FOUND) 45 46 46 47 mark_as_advanced(LIBGBM_INCLUDE_DIRS LIBGBM_LIBRARIES) -
trunk/Source/cmake/FindLibsecret.cmake
r165738 r220595 47 47 48 48 include(FindPackageHandleStandardArgs) 49 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSECRET DEFAULT_MSG LIBSECRET_INCLUDE_DIRS LIBSECRET_LIBRARIES VERSION_OK) 49 find_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 43 43 44 44 include(FindPackageHandleStandardArgs) 45 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBTASN1 DEFAULT_MSG LIBTASN1_LIBRARIES) 45 find_package_handle_standard_args(Libtasn1 REQUIRED_VARS LIBTASN1_LIBRARIES 46 FOUND_VAR LIBTASN1_FOUND) 46 47 47 48 mark_as_advanced(LIBTASN1_INCLUDE_DIRS LIBTASN1_LIBRARIES) -
trunk/Source/cmake/FindLibxkbcommon.cmake
r220000 r220595 33 33 34 34 include(FindPackageHandleStandardArgs) 35 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBXKBCOMMON DEFAULT_MSG LIBXKBCOMMON_FOUND) 35 find_package_handle_standard_args(Libxkbcommon REQUIRED_VARS LIBXKBCOMMON_FOUND 36 FOUND_VAR LIBXKBCOMMON_FOUND) -
trunk/Source/cmake/FindOpenGL.cmake
r191042 r220595 49 49 50 50 include(FindPackageHandleStandardArgs) 51 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENGL DEFAULT_MSG OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES) 51 find_package_handle_standard_args(OpenGL REQUIRED_VARS OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES 52 FOUND_VAR OPENGL_FOUND) 52 53 53 54 mark_as_advanced(OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES) -
trunk/Source/cmake/FindOpenGLES2.cmake
r184954 r220595 23 23 24 24 include(FindPackageHandleStandardArgs) 25 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENGLES2 DEFAULT_MSG OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES) 25 find_package_handle_standard_args(OpenGLES2 REQUIRED_VARS OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES 26 FOUND_VAR OPENGLES2_FOUND) 26 27 27 28 mark_as_advanced(OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES) -
trunk/Source/cmake/FindOpenWebRTC.cmake
r215221 r220595 68 68 69 69 include(FindPackageHandleStandardArgs) 70 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENWEBRTC DEFAULT_MSG OPENWEBRTC_INCLUDE_DIRS OPENWEBRTC_LIBRARIES VERSION_OK) 70 find_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 45 45 46 46 include(FindPackageHandleStandardArgs) 47 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPE_MESAREQUIRED_VARS WPE_MESA_INCLUDE_DIRS WPE_MESA_LIBRARIES)47 find_package_handle_standard_args(WPEBackend-mesa REQUIRED_VARS WPE_MESA_INCLUDE_DIRS WPE_MESA_LIBRARIES) -
trunk/Source/cmake/FindWPEBackend.cmake
r216497 r220595 45 45 46 46 include(FindPackageHandleStandardArgs) 47 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPEREQUIRED_VARS WPE_INCLUDE_DIRS WPE_LIBRARIES)47 find_package_handle_standard_args(WPEBackend REQUIRED_VARS WPE_INCLUDE_DIRS WPE_LIBRARIES) -
trunk/Source/cmake/FindWayland.cmake
r173618 r220595 33 33 34 34 include(FindPackageHandleStandardArgs) 35 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND DEFAULT_MSG WAYLAND_LIBRARIES) 35 find_package_handle_standard_args(Wayland REQUIRED_VARS WAYLAND_LIBRARIES 36 FOUND_VAR WAYLAND_FOUND) -
trunk/Source/cmake/FindWebP.cmake
r199518 r220595 49 49 50 50 include(FindPackageHandleStandardArgs) 51 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WEBP DEFAULT_MSG WEBP_INCLUDE_DIRS WEBP_LIBRARIES) 51 find_package_handle_standard_args(WebP REQUIRED_VARS WEBP_INCLUDE_DIRS WEBP_LIBRARIES 52 FOUND_VAR WEBP_FOUND) -
trunk/Source/cmake/OptionsGTK.cmake
r220532 r220595 205 205 206 206 SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_GESTURES ${GTK3_SUPPORTS_GESTURES}) 207 SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTK _UNIX_PRINT_FOUND})207 SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTKUnixPrint_FOUND}) 208 208 209 209 set(glib_components gio gio-unix gobject gthread gmodule)
Note: See TracChangeset
for help on using the changeset viewer.