Title: [166780] trunk
- Revision
- 166780
- Author
- [email protected]
- Date
- 2014-04-04 07:03:20 -0700 (Fri, 04 Apr 2014)
Log Message
[GTK][CMake] Remove FindXt.cmake.
https://bugs.webkit.org/show_bug.cgi?id=131227
Reviewed by Anders Carlsson.
.:
Xt is already detected by CMake's own FindX11.cmake, so there is no need to keep a custom FindXt.cmake around.
* Source/cmake/FindXt.cmake: Removed.
* Source/cmake/OptionsGTK.cmake:
Source/WebCore:
* PlatformGTK.cmake: Use FindX11.cmake's Xt variables instead of our own FindXt.cmake's ones.
Modified Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (166779 => 166780)
--- trunk/ChangeLog 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/ChangeLog 2014-04-04 14:03:20 UTC (rev 166780)
@@ -1,3 +1,15 @@
+2014-04-04 Raphael Kubo da Costa <[email protected]>
+
+ [GTK][CMake] Remove FindXt.cmake.
+ https://bugs.webkit.org/show_bug.cgi?id=131227
+
+ Reviewed by Anders Carlsson.
+
+ Xt is already detected by CMake's own FindX11.cmake, so there is no need to keep a custom FindXt.cmake around.
+
+ * Source/cmake/FindXt.cmake: Removed.
+ * Source/cmake/OptionsGTK.cmake:
+
2014-04-04 Tamas Gergely <[email protected]>
[EFL] Build error due to changed path of generated js files.
Modified: trunk/Source/WebCore/ChangeLog (166779 => 166780)
--- trunk/Source/WebCore/ChangeLog 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/Source/WebCore/ChangeLog 2014-04-04 14:03:20 UTC (rev 166780)
@@ -1,3 +1,12 @@
+2014-04-04 Raphael Kubo da Costa <[email protected]>
+
+ [GTK][CMake] Remove FindXt.cmake.
+ https://bugs.webkit.org/show_bug.cgi?id=131227
+
+ Reviewed by Anders Carlsson.
+
+ * PlatformGTK.cmake: Use FindX11.cmake's Xt variables instead of our own FindXt.cmake's ones.
+
2014-04-03 Andreas Kling <[email protected]>
Fast-path for casting JS wrappers to JSElement.
Modified: trunk/Source/WebCore/PlatformGTK.cmake (166779 => 166780)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-04-04 14:03:20 UTC (rev 166780)
@@ -314,7 +314,7 @@
${X11_Xcomposite_LIB}
${X11_Xdamage_LIB}
${X11_Xrender_LIB}
- ${XT_LIBRARIES}
+ ${X11_Xt_LIB}
${ZLIB_LIBRARIES}
)
@@ -335,7 +335,6 @@
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
${WEBP_INCLUDE_DIRS}
- ${XT_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
Deleted: trunk/Source/cmake/FindXt.cmake (166779 => 166780)
--- trunk/Source/cmake/FindXt.cmake 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/Source/cmake/FindXt.cmake 2014-04-04 14:03:20 UTC (rev 166780)
@@ -1,49 +0,0 @@
-# - Try to find Xt
-# Once done, this will define
-#
-# XT_FOUND - system has Xt.
-# XT_INCLUDE_DIRS - the Xt. include directories
-# XT_LIBRARIES - link these to use Xt.
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <[email protected]>
-# Copyright (C) 2013 Igalia S.L.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_package(PkgConfig)
-pkg_check_modules(XT xt)
-
-set(VERSION_OK TRUE)
-if (XT_VERSION)
- if (XT_FIND_VERSION_EXACT)
- if (NOT("${XT_FIND_VERSION}" VERSION_EQUAL "${XT_VERSION}"))
- set(VERSION_OK FALSE)
- endif ()
- else ()
- if ("${XT_VERSION}" VERSION_LESS "${XT_FIND_VERSION}")
- set(VERSION_OK FALSE)
- endif ()
- endif ()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XT_DEFAULT_MSG XT_INCLUDE_DIRS XT_LIBRARIES VERSION_OK)
Modified: trunk/Source/cmake/OptionsGTK.cmake (166779 => 166780)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-04-04 14:03:20 UTC (rev 166780)
@@ -174,7 +174,6 @@
find_package(Sqlite REQUIRED)
find_package(Threads REQUIRED)
find_package(ZLIB REQUIRED)
-find_package(Xt REQUIRED)
find_package(ATK REQUIRED)
find_package(WebP REQUIRED)
find_package(ATSPI 2.5.3)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
