Diff
Modified: trunk/ChangeLog (255669 => 255670)
--- trunk/ChangeLog 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/ChangeLog 2020-02-04 13:52:03 UTC (rev 255670)
@@ -1,3 +1,13 @@
+2020-02-04 Ross Kirsling <[email protected]>
+
+ [CMake] Add Cairo::Cairo target
+ https://bugs.webkit.org/show_bug.cgi?id=207159
+
+ Reviewed by Konstantin Tokarev.
+
+ * Source/cmake/FindCairo.cmake:
+ * Source/cmake/OptionsPlayStation.cmake:
+
2020-02-02 Ting-Wei Lan <[email protected]>
[CMake] Use opj_config.h to find OpenJPEG include directory
Modified: trunk/Source/WebCore/ChangeLog (255669 => 255670)
--- trunk/Source/WebCore/ChangeLog 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/WebCore/ChangeLog 2020-02-04 13:52:03 UTC (rev 255670)
@@ -1,3 +1,13 @@
+2020-02-04 Ross Kirsling <[email protected]>
+
+ [CMake] Add Cairo::Cairo target
+ https://bugs.webkit.org/show_bug.cgi?id=207159
+
+ Reviewed by Konstantin Tokarev.
+
+ * PlatformWinCairo.cmake:
+ * platform/Cairo.cmake:
+
2020-02-04 youenn fablet <[email protected]>
MediaDevices should handle changes of iframe allow attribute value
Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (255669 => 255670)
--- trunk/Source/WebCore/PlatformWinCairo.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -55,6 +55,6 @@
)
list(APPEND WebCoreTestSupport_LIBRARIES
- ${CAIRO_LIBRARIES}
+ Cairo::Cairo
shlwapi
)
Modified: trunk/Source/WebCore/platform/Cairo.cmake (255669 => 255670)
--- trunk/Source/WebCore/platform/Cairo.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/WebCore/platform/Cairo.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -18,10 +18,6 @@
platform/graphics/cairo/RefPtrCairo.h
)
-list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${CAIRO_INCLUDE_DIRS}
-)
-
list(APPEND WebCore_LIBRARIES
- ${CAIRO_LIBRARIES}
+ Cairo::Cairo
)
Modified: trunk/Source/WebKit/ChangeLog (255669 => 255670)
--- trunk/Source/WebKit/ChangeLog 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/WebKit/ChangeLog 2020-02-04 13:52:03 UTC (rev 255670)
@@ -1,3 +1,14 @@
+2020-02-04 Ross Kirsling <[email protected]>
+
+ [CMake] Add Cairo::Cairo target
+ https://bugs.webkit.org/show_bug.cgi?id=207159
+
+ Reviewed by Konstantin Tokarev.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+ * PlatformWin.cmake:
+
2020-02-04 Fujii Hironori <[email protected]>
[Win][Clang] WebProcessMain.h(28,14): error: token is not a valid binary operator in a preprocessor subexpression
Modified: trunk/Source/WebKit/PlatformGTK.cmake (255669 => 255670)
--- trunk/Source/WebKit/PlatformGTK.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -419,7 +419,6 @@
)
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
- ${CAIRO_INCLUDE_DIRS}
${ENCHANT_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
Modified: trunk/Source/WebKit/PlatformWPE.cmake (255669 => 255670)
--- trunk/Source/WebKit/PlatformWPE.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -271,7 +271,6 @@
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
${ATK_BRIDGE_INCLUDE_DIRS}
- ${CAIRO_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
@@ -281,11 +280,11 @@
)
list(APPEND WebKit_LIBRARIES
+ Cairo::Cairo
HarfBuzz::HarfBuzz
HarfBuzz::ICU
${ATK_LIBRARIES}
${ATK_BRIDGE_LIBRARIES}
- ${CAIRO_LIBRARIES}
${FREETYPE_LIBRARIES}
${GLIB_LIBRARIES}
${GLIB_GMODULE_LIBRARIES}
Modified: trunk/Source/WebKit/PlatformWin.cmake (255669 => 255670)
--- trunk/Source/WebKit/PlatformWin.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/WebKit/PlatformWin.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -121,10 +121,6 @@
"${WEBKIT_DIR}/win"
)
-list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
- ${CAIRO_INCLUDE_DIRS}
-)
-
set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES})
set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
Modified: trunk/Source/WebKitLegacy/ChangeLog (255669 => 255670)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-02-04 13:52:03 UTC (rev 255670)
@@ -1,3 +1,12 @@
+2020-02-04 Ross Kirsling <[email protected]>
+
+ [CMake] Add Cairo::Cairo target
+ https://bugs.webkit.org/show_bug.cgi?id=207159
+
+ Reviewed by Konstantin Tokarev.
+
+ * PlatformWin.cmake:
+
2020-02-03 Sihui Liu <[email protected]>
Crash in WebCore::IDBServer::IDBServer::createIndex
Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (255669 => 255670)
--- trunk/Source/WebKitLegacy/PlatformWin.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -1,7 +1,6 @@
if (${WTF_PLATFORM_WIN_CAIRO})
add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1 -DWEBKIT_EXPORTS=1)
list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
- ${CAIRO_INCLUDE_DIRS}
"${WEBKIT_LIBRARIES_DIR}/include"
)
list(APPEND WebKitLegacy_SOURCES_Classes
Modified: trunk/Source/cmake/FindCairo.cmake (255669 => 255670)
--- trunk/Source/cmake/FindCairo.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/cmake/FindCairo.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -1,12 +1,5 @@
-# - Try to find Cairo
-# Once done, this will define
+# Copyright (C) 2020 Sony Interactive Entertainment Inc.
#
-# CAIRO_FOUND - system has Cairo
-# CAIRO_INCLUDE_DIRS - the Cairo include directories
-# CAIRO_LIBRARIES - link these to use Cairo
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <[email protected]>
-#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
@@ -28,48 +21,89 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-find_package(PkgConfig)
+#[=======================================================================[.rst:
+FindCairo
+--------------
+
+Find Cairo headers and libraries.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+``Cairo::Cairo``
+ The Cairo library, if found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This will define the following variables in your project:
+
+``Cairo_FOUND``
+ true if (the requested version of) Cairo is available.
+``Cairo_VERSION``
+ the version of Cairo.
+``Cairo_LIBRARIES``
+ the libraries to link against to use Cairo.
+``Cairo_INCLUDE_DIRS``
+ where to find the Cairo headers.
+``Cairo_COMPILE_OPTIONS``
+ this should be passed to target_compile_options(), if the
+ target is not used for linking
+
+#]=======================================================================]
+
+include(FindPkgConfig)
pkg_check_modules(PC_CAIRO QUIET cairo)
+set(Cairo_COMPILE_OPTIONS ${PC_CAIRO_CFLAGS_OTHER})
+set(Cairo_VERSION ${PC_CAIRO_VERSION})
-find_path(CAIRO_INCLUDE_DIRS
+find_path(Cairo_INCLUDE_DIR
NAMES cairo.h
- HINTS ${PC_CAIRO_INCLUDEDIR}
- ${PC_CAIRO_INCLUDE_DIRS}
+ HINTS ${PC_CAIRO_INCLUDEDIR} ${PC_CAIRO_INCLUDE_DIR}
PATH_SUFFIXES cairo
)
-find_library(CAIRO_LIBRARIES
- NAMES cairo
- HINTS ${PC_CAIRO_LIBDIR}
- ${PC_CAIRO_LIBRARY_DIRS}
+find_library(Cairo_LIBRARY
+ NAMES ${Cairo_NAMES} cairo
+ HINTS ${PC_CAIRO_LIBDIR} ${PC_CAIRO_LIBRARY_DIRS}
)
-if (CAIRO_INCLUDE_DIRS)
- if (EXISTS "${CAIRO_INCLUDE_DIRS}/cairo-version.h")
- file(READ "${CAIRO_INCLUDE_DIRS}/cairo-version.h" CAIRO_VERSION_CONTENT)
+if (Cairo_INCLUDE_DIR AND NOT Cairo_VERSION)
+ if (EXISTS "${Cairo_INCLUDE_DIR}/cairo-version.h")
+ file(READ "${Cairo_INCLUDE_DIR}/cairo-version.h" Cairo_VERSION_CONTENT)
- string(REGEX MATCH "#define +CAIRO_VERSION_MAJOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
- set(CAIRO_VERSION_MAJOR "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "#define +CAIRO_VERSION_MAJOR +([0-9]+)" _dummy "${Cairo_VERSION_CONTENT}")
+ set(Cairo_VERSION_MAJOR "${CMAKE_MATCH_1}")
- string(REGEX MATCH "#define +CAIRO_VERSION_MINOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
- set(CAIRO_VERSION_MINOR "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "#define +CAIRO_VERSION_MINOR +([0-9]+)" _dummy "${Cairo_VERSION_CONTENT}")
+ set(Cairo_VERSION_MINOR "${CMAKE_MATCH_1}")
- string(REGEX MATCH "#define +CAIRO_VERSION_MICRO +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
- set(CAIRO_VERSION_MICRO "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "#define +CAIRO_VERSION_MICRO +([0-9]+)" _dummy "${Cairo_VERSION_CONTENT}")
+ set(Cairo_VERSION_PATCH "${CMAKE_MATCH_1}")
- set(CAIRO_VERSION "${CAIRO_VERSION_MAJOR}.${CAIRO_VERSION_MINOR}.${CAIRO_VERSION_MICRO}")
+ set(Cairo_VERSION "${Cairo_VERSION_MAJOR}.${Cairo_VERSION_MINOR}.${Cairo_VERSION_PATCH}")
endif ()
endif ()
-if ("${Cairo_FIND_VERSION}" VERSION_GREATER "${CAIRO_VERSION}")
- message(FATAL_ERROR "Required version (" ${Cairo_FIND_VERSION} ") is higher than found version (" ${CAIRO_VERSION} ")")
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Cairo
+ FOUND_VAR Cairo_FOUND
+ REQUIRED_VARS Cairo_LIBRARY Cairo_INCLUDE_DIR
+ VERSION_VAR Cairo_VERSION
+)
+
+if (Cairo_LIBRARY AND NOT TARGET Cairo::Cairo)
+ add_library(Cairo::Cairo UNKNOWN IMPORTED GLOBAL)
+ set_target_properties(Cairo::Cairo PROPERTIES
+ IMPORTED_LOCATION "${Cairo_LIBRARY}"
+ INTERFACE_COMPILE_OPTIONS "${Cairo_COMPILE_OPTIONS}"
+ INTERFACE_INCLUDE_DIRECTORIES "${Cairo_INCLUDE_DIR}"
+ )
endif ()
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cairo REQUIRED_VARS CAIRO_INCLUDE_DIRS CAIRO_LIBRARIES
- VERSION_VAR CAIRO_VERSION)
+mark_as_advanced(Cairo_INCLUDE_DIR Cairo_LIBRARIES)
-mark_as_advanced(
- CAIRO_INCLUDE_DIRS
- CAIRO_LIBRARIES
-)
+if (Cairo_FOUND)
+ set(Cairo_LIBRARIES ${Cairo_LIBRARY})
+ set(Cairo_INCLUDE_DIRS ${Cairo_INCLUDE_DIR})
+endif ()
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (255669 => 255670)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -116,7 +116,6 @@
# Emulate what pkg-config would do with statically compiled libraries
# FIXME: https://bugs.webkit.org/show_bug.cgi?id=192410
-list(APPEND CAIRO_LIBRARIES ${PIXMAN_LIBRARIES})
list(APPEND CURL_LIBRARIES ${NGHTTP2_LIBRARIES})
SET_AND_EXPOSE_TO_BUILD(HAVE_PTHREAD_SETNAME_NP ON)
Modified: trunk/Tools/ChangeLog (255669 => 255670)
--- trunk/Tools/ChangeLog 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/ChangeLog 2020-02-04 13:52:03 UTC (rev 255670)
@@ -1,3 +1,20 @@
+2020-02-04 Ross Kirsling <[email protected]>
+
+ [CMake] Add Cairo::Cairo target
+ https://bugs.webkit.org/show_bug.cgi?id=207159
+
+ Reviewed by Konstantin Tokarev.
+
+ * DumpRenderTree/PlatformWin.cmake:
+ * ImageDiff/Cairo.cmake:
+ * TestWebKitAPI/PlatformWPE.cmake:
+ * TestWebKitAPI/PlatformWin.cmake:
+ * TestWebKitAPI/glib/CMakeLists.txt:
+ * WebKitTestRunner/PlatformGTK.cmake:
+ * WebKitTestRunner/PlatformWPE.cmake:
+ * WebKitTestRunner/PlatformWin.cmake:
+ * wpe/backends/CMakeLists.txt:
+
2020-02-03 Jiewen Tan <[email protected]>
Pass a hint from the extension to decidePolicyForSOAuthorizationLoadWithCurrentPolicy
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (255669 => 255670)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -84,8 +84,10 @@
if (${WTF_PLATFORM_WIN_CAIRO})
list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
cairo
- ${CAIRO_INCLUDE_DIRS}
)
+ list(APPEND DumpRenderTreeLib_LIBRARIES
+ Cairo::Cairo
+ )
list(APPEND DumpRenderTreeLib_SOURCES
cairo/PixelDumpSupportCairo.cpp
)
Modified: trunk/Tools/ImageDiff/Cairo.cmake (255669 => 255670)
--- trunk/Tools/ImageDiff/Cairo.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/ImageDiff/Cairo.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -2,12 +2,8 @@
cairo/PlatformImageCairo.cpp
)
-list(APPEND ImageDiff_SYSTEM_INCLUDE_DIRECTORIES
- ${CAIRO_INCLUDE_DIRS}
-)
-
list(APPEND ImageDiff_LIBRARIES
- ${CAIRO_LIBRARIES}
+ Cairo::Cairo
)
list(APPEND ImageDiff_PRIVATE_DEFINITIONS USE_CAIRO=1)
Modified: trunk/Tools/TestWebKitAPI/PlatformWPE.cmake (255669 => 255670)
--- trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -9,7 +9,6 @@
add_dependencies(TestWebKitAPIInjectedBundle TestWebKitAPI-forwarding-headers)
include_directories(SYSTEM
- ${CAIRO_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
${GSTREAMER_AUDIO_INCLUDE_DIRS}
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (255669 => 255670)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -54,7 +54,7 @@
if (${WTF_PLATFORM_WIN_CAIRO})
list(APPEND TestWebCore_LIBRARIES
- ${CAIRO_LIBRARIES}
+ Cairo::Cairo
${OPENSSL_LIBRARIES}
mfuuid
strmiids
Modified: trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt (255669 => 255670)
--- trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2020-02-04 13:52:03 UTC (rev 255670)
@@ -12,7 +12,6 @@
)
set(WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
- ${CAIRO_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (255669 => 255670)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -20,14 +20,13 @@
list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
- ${CAIRO_INCLUDE_DIRS}
${GTK3_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
)
list(APPEND WebKitTestRunner_LIBRARIES
+ Cairo::Cairo
${ATK_LIBRARIES}
- ${CAIRO_LIBRARIES}
${GTK3_LIBRARIES}
${GLIB_LIBRARIES}
WebCore
Modified: trunk/Tools/WebKitTestRunner/PlatformWPE.cmake (255669 => 255670)
--- trunk/Tools/WebKitTestRunner/PlatformWPE.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/WebKitTestRunner/PlatformWPE.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -21,7 +21,6 @@
)
list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
- ${CAIRO_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${LIBXKBCOMMON_INCLUDE_DIRS}
${WPEBACKEND_FDO_INCLUDE_DIRS}
@@ -28,7 +27,7 @@
)
list(APPEND WebKitTestRunner_LIBRARIES
- ${CAIRO_LIBRARIES}
+ Cairo::Cairo
${GLIB_LIBRARIES}
${LIBXKBCOMMON_LIBRARIES}
${WPEBACKEND_FDO_LIBRARIES}
@@ -36,7 +35,7 @@
)
set(WebKitTestRunnerInjectedBundle_LIBRARIES
- ${CAIRO_LIBRARIES}
+ Cairo::Cairo
${GLIB_LIBRARIES}
WebCoreTestSupport
WebKit
Modified: trunk/Tools/WebKitTestRunner/PlatformWin.cmake (255669 => 255670)
--- trunk/Tools/WebKitTestRunner/PlatformWin.cmake 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/WebKitTestRunner/PlatformWin.cmake 2020-02-04 13:52:03 UTC (rev 255670)
@@ -24,7 +24,6 @@
list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
cairo
win
- ${CAIRO_INCLUDE_DIRS}
${FORWARDING_HEADERS_DIR}
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/win
)
Modified: trunk/Tools/wpe/backends/CMakeLists.txt (255669 => 255670)
--- trunk/Tools/wpe/backends/CMakeLists.txt 2020-02-04 12:12:17 UTC (rev 255669)
+++ trunk/Tools/wpe/backends/CMakeLists.txt 2020-02-04 13:52:03 UTC (rev 255670)
@@ -22,7 +22,6 @@
set(WPEToolingBackends_SYSTEM_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
${ATK_BRIDGE_INCLUDE_DIRS}
- ${CAIRO_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${LIBEPOXY_INCLUDE_DIRS}
${WPE_INCLUDE_DIRS}
@@ -30,9 +29,9 @@
)
set(WPEToolingBackends_LIBRARIES
+ Cairo::Cairo
${ATK_LIBRARIES}
${ATK_BRIDGE_LIBRARIES}
- ${CAIRO_LIBRARIES}
${GLIB_LIBRARIES}
${LIBEPOXY_LIBRARIES}
${LIBXKBCOMMON_LIBRARIES}
