Changeset 260427 in webkit
- Timestamp:
- Apr 21, 2020 8:26:53 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r260356 r260427 1 2020-04-21 Adrian Perez de Castro <aperez@igalia.com> 2 3 [GTK][CMake] Make gtk-unix-print a component of FindGTK.cmake 4 https://bugs.webkit.org/show_bug.cgi?id=210792 5 6 Reviewed by Carlos Garcia Campos. 7 8 * Source/cmake/FindGTK.cmake: Support an "unix-print" component. 9 * Source/cmake/FindGTKUnixPrint.cmake: Removed. 10 * Source/cmake/OptionsGTK.cmake: Use the "unix-print" component of the GTK find module. 11 1 12 2020-04-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 13 -
trunk/Source/WebKit/ChangeLog
r260419 r260427 1 2020-04-21 Adrian Perez de Castro <aperez@igalia.com> 2 3 [GTK][CMake] Make gtk-unix-print a component of FindGTK.cmake 4 https://bugs.webkit.org/show_bug.cgi?id=210792 5 6 Reviewed by Carlos Garcia Campos. 7 8 No new tests needed. 9 10 * PlatformGTK.cmake: Use the GTK::UnixPrint imported target. 11 1 12 2020-04-21 Philippe Normand <pnormand@igalia.com> 2 13 -
trunk/Source/WebKit/PlatformGTK.cmake
r260277 r260427 427 427 ${GSTREAMER_PBUTILS_INCLUDE_DIRS} 428 428 ${GTK_INCLUDE_DIRS} 429 ${GTK_UNIX_PRINT_INCLUDE_DIRS}430 429 ${LIBSOUP_INCLUDE_DIRS} 431 430 ) … … 459 458 list(APPEND GPUProcess_SOURCES 460 459 GPUProcess/EntryPoint/unix/GPUProcessMain.cpp 461 )462 463 list(APPEND WebKit_LIBRARIES464 ${GTK_UNIX_PRINT_LIBRARIES}465 460 ) 466 461 … … 470 465 ${WPEBACKEND_FDO_LIBRARIES} 471 466 ) 467 endif () 468 469 if (GTK_UNIX_PRINT_FOUND) 470 list(APPEND WebKit_LIBRARIES GTK::UnixPrint) 472 471 endif () 473 472 -
trunk/Source/cmake/FindGTK.cmake
r259641 r260427 31 31 Find GTK headers and libraries. 32 32 33 Optional Components 34 ^^^^^^^^^^^^^^^^^^^ 35 36 The ``COMPONENTS`` (or ``OPTIONAL_COMPONENTS``) keyword can be passed to 37 ``find_package()``, the following GTK components can be searched for: 38 39 - ``unix-print`` 40 41 33 42 Imported Targets 34 43 ^^^^^^^^^^^^^^^^ … … 36 45 ``GTK::GTK`` 37 46 The GTK library, if found. 47 ``GTK::UnixPrint`` 48 The GTK unix-print library, if found. 38 49 39 50 Result Variables … … 44 55 ``GTK_FOUND`` 45 56 true if (the requested version of) GTK is available. 57 ``GTK_UNIX_PRINT_FOUND`` 58 true if the ``unix-print`` component is available. 46 59 ``GTK_4`` 47 60 whether GTK 4 was detected … … 69 82 if (GTK_FIND_VERSION VERSION_LESS 3.90) 70 83 set(GTK_PC_MODULE "gtk+-3.0") 84 set(GTK_PC_UNIX_PRINT_MODULE "gtk+-unix-print-3.0") 71 85 set(GTK_4 FALSE) 72 86 set(GTK_3 TRUE) 73 87 else () 74 88 set(GTK_PC_MODULE "gtk4") 89 set(GTK_PC_UNIX_PRINT_MODULE "gtk4-unix-print") 75 90 set(GTK_4 TRUE) 76 91 set(GTK_3 FALSE) … … 116 131 endif () 117 132 133 # Try to find additional components 134 foreach (gtk_component ${GTK_FIND_COMPONENTS}) 135 if (NOT "${gtk_component}" STREQUAL unix-print) 136 message(FATAL_ERROR "Invalid component name: ${gtk_component}") 137 endif () 138 pkg_check_modules(GTK_UNIX_PRINT IMPORTED_TARGET "${GTK_PC_UNIX_PRINT_MODULE}") 139 if (GTK_FIND_REQUIRED_unix-print AND NOT GTK_UNIX_PRINT_FOUND) 140 message(FATAL_ERROR "Component unix-print not found") 141 endif () 142 if (TARGET PkgConfig::GTK_UNIX_PRINT AND NOT TARGET GTK::UnixPrint) 143 add_library(GTK::UnixPrint INTERFACE IMPORTED GLOBAL) 144 set_property(TARGET GTK::UnixPrint PROPERTY 145 INTERFACE_LINK_LIBRARIES PkgConfig::GTK_UNIX_PRINT) 146 endif () 147 endforeach () 148 118 149 include(FindPackageHandleStandardArgs) 119 150 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK DEFAULT_MSG GTK_VERSION GTK_VERSION_OK) -
trunk/Source/cmake/OptionsGTK.cmake
r260356 r260427 39 39 find_package(LibGcrypt 1.6.0 REQUIRED) 40 40 find_package(GLIB 2.44.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule) 41 find_package(GTK ${GTK_MINIMUM_VERSION} REQUIRED )41 find_package(GTK ${GTK_MINIMUM_VERSION} REQUIRED OPTIONAL_COMPONENTS unix-print) 42 42 find_package(HarfBuzz 0.9.18 REQUIRED COMPONENTS ICU) 43 43 find_package(ICU 60.2 REQUIRED COMPONENTS data i18n uc) … … 53 53 find_package(ATSPI 2.5.3) 54 54 find_package(EGL) 55 find_package(GTKUnixPrint)56 55 find_package(OpenGL) 57 56 find_package(OpenGLES2) … … 225 224 add_definitions(-DSVN_REVISION="${SVN_REVISION}") 226 225 227 SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTK UnixPrint_FOUND})226 SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTK_UNIX_PRINT_FOUND}) 228 227 229 228 if (USE_WPE_RENDERER) -
trunk/Tools/ChangeLog
r260426 r260427 1 2020-04-21 Adrian Perez de Castro <aperez@igalia.com> 2 3 [GTK][CMake] Make gtk-unix-print a component of FindGTK.cmake 4 https://bugs.webkit.org/show_bug.cgi?id=210792 5 6 Reviewed by Carlos Garcia Campos. 7 8 * TestWebKitAPI/glib/PlatformGTK.cmake: Use the GTK::UnixPrint imported target. 9 1 10 2020-04-21 Philippe Normand <pnormand@igalia.com> 2 11 -
trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake
r259641 r260427 15 15 list(APPEND WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES 16 16 ${ATSPI_INCLUDE_DIRS} 17 ${GTK_UNIX_PRINT_INCLUDE_DIRS}18 17 ) 19 18 20 19 list(APPEND WebKitGLibAPITest_LIBRARIES 21 20 ${ATSPI_LIBRARIES} 22 ${GTK_UNIX_PRINT_LIBRARIES}23 21 GTK::GTK 24 22 ) 23 24 if (GTK_UNIX_PRINT_FOUND) 25 list(APPEND WebKitGLibAPITest_LIBRARIES GTK::UnixPrint) 26 endif () 25 27 26 28 list(APPEND WebKitGLibAPIWebProcessTests
Note: See TracChangeset
for help on using the changeset viewer.