From 0c34ceed710ee1cf0329df0f05b8dfaf8fc23f4f Mon Sep 17 00:00:00 2001 From: "kubo@profusion.mobi" Date: Thu, 23 Feb 2012 00:26:55 +0000 Subject: [PATCH] [CMake] Remove FindGDK.cmake and FindGDK-PixBuf.cmake https://bugs.webkit.org/show_bug.cgi?id=79292 Reviewed by Daniel Bates. These files were committed when the EFL port's buildsystem code was upstreamed, but are currently not being used anywhere, as the EFL port has not depended on GDK for a long time. * Source/cmake/FindGDK-PixBuf.cmake: Removed. * Source/cmake/FindGDK.cmake: Removed. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108572 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 14 +++++++++++++ Source/cmake/FindGDK-PixBuf.cmake | 32 ----------------------------- Source/cmake/FindGDK.cmake | 43 --------------------------------------- 3 files changed, 14 insertions(+), 75 deletions(-) delete mode 100644 Source/cmake/FindGDK-PixBuf.cmake delete mode 100644 Source/cmake/FindGDK.cmake diff --git a/ChangeLog b/ChangeLog index 2d42f86..6ff63d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2012-02-22 Raphael Kubo da Costa + + [CMake] Remove FindGDK.cmake and FindGDK-PixBuf.cmake + https://bugs.webkit.org/show_bug.cgi?id=79292 + + Reviewed by Daniel Bates. + + These files were committed when the EFL port's buildsystem code + was upstreamed, but are currently not being used anywhere, as the EFL + port has not depended on GDK for a long time. + + * Source/cmake/FindGDK-PixBuf.cmake: Removed. + * Source/cmake/FindGDK.cmake: Removed. + 2012-02-22 Martin Robinson [GTK] Clean build is broken when using make -j diff --git a/Source/cmake/FindGDK-PixBuf.cmake b/Source/cmake/FindGDK-PixBuf.cmake deleted file mode 100644 index d21d87a..0000000 --- a/Source/cmake/FindGDK-PixBuf.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# - Try to find gdk-pixbuf 2.0 -# Once done, this will define -# -# GDK-PixBuf_FOUND - system has GDK-PixBuf -# GDK-PixBuf_INCLUDE_DIRS - the GDK-PixBuf include directories -# GDK-PixBuf_LIBRARIES - link these to use GDK-PixBuf - -include(LibFindMacros) - -# Use pkg-config to get hints about paths -libfind_pkg_check_modules(GDK-PixBuf_PKGCONF gdk-pixbuf-2.0) - -# Main include dir -find_path(GDK-PixBuf_INCLUDE_DIR - NAMES gdk-pixbuf/gdk-pixbuf.h - PATHS ${GDK-PixBuf_PKGCONF_INCLUDE_DIRS} - PATH_SUFFIXES gtk-2.0 -) - -# Finally the library itself -find_library(GDK-PixBuf_LIBRARY - NAMES gdk_pixbuf-2.0 - PATHS ${GDK-PixBuf_PKGCONF_LIBRARY_DIRS} -) - -# Set the include dir variables and the libraries and let libfind_process do the rest. -# NOTE: Singular variables for this library, plural for libraries this this lib depends on. -set(GDK-PixBuf_PROCESS_INCLUDES GDK-PixBuf_INCLUDE_DIR) -set(GDK-PixBuf_PROCESS_LIBS GDK-PixBuf_LIBRARY) -libfind_process(GDK-PixBuf) - - diff --git a/Source/cmake/FindGDK.cmake b/Source/cmake/FindGDK.cmake deleted file mode 100644 index f7c469e..0000000 --- a/Source/cmake/FindGDK.cmake +++ /dev/null @@ -1,43 +0,0 @@ -# - Try to find GDK 2.0 -# Once done, this will define -# -# GDK_FOUND - system has GDK -# GDK_INCLUDE_DIRS - the GDK include directories -# GDK_LIBRARIES - link these to use GDK - -include(LibFindMacros) - -# Dependencies -libfind_package(GDK GDK-PixBuf) -libfind_package(GDK Pango) -libfind_package(GDK GIO) - -# Use pkg-config to get hints about paths -libfind_pkg_check_modules(GDK_PKGCONF gdk-2.0) - -# Main include dir -find_path(GDK_INCLUDE_DIR - NAMES gdk/gdk.h - PATHS ${GDK_PKGCONF_INCLUDE_DIRS} - PATH_SUFFIXES gtk-2.0 -) - -# Glib-related libraries also use a separate config header, which is in lib dir -find_path(GDKConfig_INCLUDE_DIR - NAMES gdkconfig.h - PATHS ${GDK_PKGCONF_INCLUDE_DIRS} /usr - PATH_SUFFIXES lib/gtk-2.0/include -) - -# Finally the library itself -find_library(GDK_LIBRARY - NAMES gdk-x11-2.0 gdk-win32-2.0 - PATHS ${GDK_PKGCONF_LIBRARY_DIRS} -) - -# Set the include dir variables and the libraries and let libfind_process do the rest. -# NOTE: Singular variables for this library, plural for libraries this this lib depends on. -set(GDK_PROCESS_INCLUDES GDK_INCLUDE_DIR GDKConfig_INCLUDE_DIR GDK-PixBuf_INCLUDE_DIRS Pango_INCLUDE_DIRS GIO_INCLUDE_DIRS) -set(GDK_PROCESS_LIBS GDK_LIBRARY GDK-PixBuf_LIBRARIES Pango_LIBRARIES GIO_LIBRARIES) -libfind_process(GDK) - -- 2.7.4