[EFL] Drop support for the EFL 1.7
authorryuan.choi@navercorp.com <ryuan.choi@navercorp.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Dec 2014 03:48:30 +0000 (03:48 +0000)
committerryuan.choi@navercorp.com <ryuan.choi@navercorp.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Dec 2014 03:48:30 +0000 (03:48 +0000)
https://bugs.webkit.org/show_bug.cgi?id=139114

Reviewed by Gyuyoung Kim.

.:

* Source/cmake/EFLHelpers.cmake: Removed.
* Source/cmake/FindEcore.cmake: Removed.
* Source/cmake/FindEdje.cmake: Removed.
* Source/cmake/FindEet.cmake: Removed.
* Source/cmake/FindEeze.cmake: Removed.
* Source/cmake/FindEfreet.cmake: Removed.
* Source/cmake/FindEina.cmake: Removed.
* Source/cmake/FindElementary.cmake: Removed.
* Source/cmake/FindEvas.cmake: Removed.
* Source/cmake/OptionsEfl.cmake:

Source/WTF:

* wtf/efl/EflTypedefs.h: Removed old definitions which EFL 1.7 used.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176589 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/efl/EflTypedefs.h
Source/cmake/EFLHelpers.cmake [deleted file]
Source/cmake/FindEcore.cmake [deleted file]
Source/cmake/FindEdje.cmake [deleted file]
Source/cmake/FindEet.cmake [deleted file]
Source/cmake/FindEeze.cmake [deleted file]
Source/cmake/FindEfreet.cmake [deleted file]
Source/cmake/FindEina.cmake [deleted file]
Source/cmake/FindElementary.cmake [deleted file]
Source/cmake/FindEvas.cmake [deleted file]
Source/cmake/OptionsEfl.cmake

index 833e58b..957080c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2014-11-30  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        [EFL] Drop support for the EFL 1.7
+        https://bugs.webkit.org/show_bug.cgi?id=139114
+
+        Reviewed by Gyuyoung Kim.
+
+        * Source/cmake/EFLHelpers.cmake: Removed.
+        * Source/cmake/FindEcore.cmake: Removed.
+        * Source/cmake/FindEdje.cmake: Removed.
+        * Source/cmake/FindEet.cmake: Removed.
+        * Source/cmake/FindEeze.cmake: Removed.
+        * Source/cmake/FindEfreet.cmake: Removed.
+        * Source/cmake/FindEina.cmake: Removed.
+        * Source/cmake/FindElementary.cmake: Removed.
+        * Source/cmake/FindEvas.cmake: Removed.
+        * Source/cmake/OptionsEfl.cmake:
+
 2014-11-28  Philippe Normand  <pnormand@igalia.com>
 
         [CMake] Build failure against GStreamer git master
index ed80810..8a0b9ca 100644 (file)
@@ -1,3 +1,12 @@
+2014-11-30  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        [EFL] Drop support for the EFL 1.7
+        https://bugs.webkit.org/show_bug.cgi?id=139114
+
+        Reviewed by Gyuyoung Kim.
+
+        * wtf/efl/EflTypedefs.h: Removed old definitions which EFL 1.7 used.
+
 2014-11-21  Anders Carlsson  <andersca@apple.com>
 
         Remove the Timer parameters from timer callbacks
index 7512f95..c708063 100644 (file)
@@ -44,15 +44,9 @@ typedef struct _Ecore_Fd_Handler Ecore_Fd_Handler;
 typedef struct _Eina_List Eina_List;
 typedef struct _Eina_Module Eina_Module;
 typedef struct _Eina_Rectangle Eina_Rectangle;
-#if USE(EO)
 typedef struct _Eo_Opaque Evas;
 typedef struct _Eo_Opaque Evas_Object;
 typedef struct _Eo_Opaque Ecore_Timer;
-#else
-typedef struct _Evas Evas;
-typedef struct _Evas_Object Evas_Object;
-typedef struct _Ecore_Timer Ecore_Timer;
-#endif
 #endif
 
 #endif
diff --git a/Source/cmake/EFLHelpers.cmake b/Source/cmake/EFLHelpers.cmake
deleted file mode 100644 (file)
index ab95c7f..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-# - Set of macros and functions that are useful for building the EFL port.
-#
-# The following functions are currently defined:
-# FIND_EFL_LIBRARY(<name> HEADERS <header1> ... HEADER_PREFIXES <prefix1> ... LIBRARY <libname>)
-#     Looks for the header files inside the given prefix directories, and for the library
-#     passed to the LIBRARY parameter.
-#     Two #defines in the form <UPPERCASED_NAME>_VERSION_MAJOR and <UPPERCASED_NAME>_VERSION_MINOR
-#     are looked for in all the given headers, and the first occurrence is used to build the library's
-#     version number.
-#     This function defines the following variables:
-#     - <UPPERCASED_NAME>_INCLUDE_DIRS: All the directories required by this library's headers.
-#     - <UPPERCASED_NAME>_LIBRARIES:    All the libraries required to link against this library.
-#     - <UPPERCASED_NAME>_VERSION:      The library's version in the format "major.minor".
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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.
-
-include(CMakeParseArguments)
-
-function(FIND_EFL_LIBRARY _name)
-    CMAKE_PARSE_ARGUMENTS(PARAM "" "LIBRARY" "HEADERS;HEADER_PREFIXES" ${ARGN})
-
-    string(TOUPPER ${_name} _name_upper)
-    set(_version_found FALSE)
-
-    foreach (_current_header ${PARAM_HEADERS})
-        find_path(${_current_header}_INCLUDE_DIR NAMES ${_current_header} PATH_SUFFIXES ${PARAM_HEADER_PREFIXES})
-
-        set(_header_path "${${_current_header}_INCLUDE_DIR}/${_current_header}")
-        if (EXISTS ${_header_path})
-            list(APPEND ${_name}_INCLUDE_DIRS "${${_current_header}_INCLUDE_DIR}")
-
-            if (NOT _version_found)
-                file(READ "${_header_path}" _header_contents)
-
-                string(REGEX MATCH "#define +${_name_upper}_VERSION_MAJOR +([0-9]+)" _dummy "${_header_contents}")
-                set(_version_major "${CMAKE_MATCH_1}")
-                string(REGEX MATCH "#define +${_name_upper}_VERSION_MINOR +([0-9]+)" _dummy "${_header_contents}")
-                set(_version_minor "${CMAKE_MATCH_1}")
-
-                if (_version_major AND _version_minor)
-                    set(_version_found TRUE)
-                endif ()
-            endif ()
-        endif ()
-    endforeach ()
-
-    find_library(${_name}_LIBRARIES NAMES ${PARAM_LIBRARY})
-
-    set(${_name}_INCLUDE_DIRS ${${_name}_INCLUDE_DIRS} PARENT_SCOPE)
-    set(${_name}_LIBRARIES ${${_name}_LIBRARIES} PARENT_SCOPE)
-    set(${_name}_VERSION "${_version_major}.${_version_minor}" PARENT_SCOPE)
-endfunction()
diff --git a/Source/cmake/FindEcore.cmake b/Source/cmake/FindEcore.cmake
deleted file mode 100644 (file)
index bef0bef..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-# - Try to find Ecore
-# Once done, this will define
-#
-#  ECORE_FOUND - system has Ecore installed.
-#  ECORE_INCLUDE_DIRS - directories which contain the Ecore headers.
-#  ECORE_LIBRARIES - libraries required to link against Ecore.
-#
-# Optionally, the COMPONENTS keyword can be passed to find_package()
-# and additional Ecore libraries can be looked for. Currently, the
-# following libraries can be searched, and they define the following
-# variables if found:
-#
-#  EVAS  - ECORE_EVAS_INCLUDE_DIRS and ECORE_EVAS_LIBRARIES
-#  FILE  - ECORE_FILE_INCLUDE_DIRS and ECORE_FILE_LIBRARIES
-#  INPUT - ECORE_INPUT_INCLUDE_DIRS and ECORE_INPUT_LIBRARIES
-#  X     - ECORE_X_INCLUDE_DIRS and ECORE_X_LIBRARIES
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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.
-
-include(EFLHelpers)
-
-FIND_EFL_LIBRARY(ECORE
-    HEADERS Ecore.h Ecore_Common.h
-    HEADER_PREFIXES ecore-1
-    LIBRARY ecore
-)
-
-# Components.
-# Since EFL version 1.8, include path of Ecore sub modules have been changed
-# from ecore-1 to ecore-XXX-1
-FIND_EFL_LIBRARY(ECORE_EVAS
-    HEADERS Ecore_Evas.h
-    HEADER_PREFIXES ecore-1 ecore-evas-1
-    LIBRARY ecore_evas
-)
-FIND_EFL_LIBRARY(ECORE_FILE
-    HEADERS Ecore_File.h
-    HEADER_PREFIXES ecore-1 ecore-file-1
-    LIBRARY ecore_file
-)
-FIND_EFL_LIBRARY(ECORE_INPUT
-    HEADERS Ecore_Input.h
-    HEADER_PREFIXES ecore-1 ecore-input-1
-    LIBRARY ecore_input
-)
-FIND_EFL_LIBRARY(ECORE_X
-    HEADERS Ecore_X.h
-    HEADER_PREFIXES ecore-1 ecore-x-1
-    LIBRARY ecore_x
-)
-FIND_EFL_LIBRARY(ECORE_IMF
-    HEADERS Ecore_IMF.h
-    HEADER_PREFIXES ecore-1 ecore-imf-1
-    LIBRARY ecore_imf
-)
-FIND_EFL_LIBRARY(ECORE_IMF_EVAS
-    HEADERS Ecore_IMF_Evas.h
-    HEADER_PREFIXES ecore-1 ecore-imf-evas-1
-    LIBRARY ecore_imf_evas
-)
-
-foreach (_component ${Ecore_FIND_COMPONENTS})
-    set(_ecore_component "ECORE_${_component}")
-    string(TOUPPER ${_ecore_component} _UPPER_NAME)
-
-    list(APPEND _ECORE_REQUIRED_COMPONENT_VARS ${_UPPER_NAME}_INCLUDE_DIRS ${_UPPER_NAME}_LIBRARIES)
-endforeach ()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ecore REQUIRED_VARS ECORE_INCLUDE_DIRS ECORE_LIBRARIES ${_ECORE_REQUIRED_COMPONENT_VARS}
-                                        VERSION_VAR   ECORE_VERSION)
diff --git a/Source/cmake/FindEdje.cmake b/Source/cmake/FindEdje.cmake
deleted file mode 100644 (file)
index 290d9a3..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# - Try to find Edje
-# Once done, this will define
-#
-#  EDJE_FOUND - system has Edje installed.
-#  EDJE_INCLUDE_DIRS - directories which contain the Edje headers.
-#  EDJE_LIBRARIES - libraries required to link against Edje.
-#  EDJE_CC_EXECUTABLE - full path to the `edje_cc' program.
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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.
-
-include(EFLHelpers)
-
-FIND_EFL_LIBRARY(EDJE
-    HEADERS Edje.h Edje_Common.h
-    HEADER_PREFIXES edje-1
-    LIBRARY edje
-)
-
-find_program(EDJE_CC_EXECUTABLE
-    NAMES edje_cc
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Edje REQUIRED_VARS EDJE_INCLUDE_DIRS EDJE_LIBRARIES EDJE_CC_EXECUTABLE
-                                       VERSION_VAR   EDJE_VERSION)
diff --git a/Source/cmake/FindEet.cmake b/Source/cmake/FindEet.cmake
deleted file mode 100644 (file)
index 51abd12..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# - Try to find Eet
-# Once done, this will define
-#
-#  EET_FOUND - system has Eet installed.
-#  EET_INCLUDE_DIRS - directories which contain the Eet headers.
-#  EET_LIBRARIES - libraries required to link against Eet.
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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.
-
-include(EFLHelpers)
-
-FIND_EFL_LIBRARY(EET
-    HEADERS Eet.h
-    HEADER_PREFIXES eet-1
-    LIBRARY eet
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eet REQUIRED_VARS EET_INCLUDE_DIRS EET_LIBRARIES
-                                      VERSION_VAR   EET_VERSION)
diff --git a/Source/cmake/FindEeze.cmake b/Source/cmake/FindEeze.cmake
deleted file mode 100644 (file)
index d92ac33..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# - Try to find Eeze
-# Once done, this will define
-#
-#  EEZE_FOUND - system has Eeze installed.
-#  EEZE_INCLUDE_DIRS - directories which contain the Eeze headers.
-#  EEZE_LIBRARIES - libraries required to link against Eeze.
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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.
-
-include(EFLHelpers)
-
-FIND_EFL_LIBRARY(EEZE
-    HEADERS Eeze.h
-    HEADER_PREFIXES eeze-1
-    LIBRARY eeze
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eeze REQUIRED_VARS EEZE_INCLUDE_DIRS EEZE_LIBRARIES
-                                       VERSION_VAR   EEZE_VERSION)
diff --git a/Source/cmake/FindEfreet.cmake b/Source/cmake/FindEfreet.cmake
deleted file mode 100644 (file)
index 9e67a7b..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# - Try to find Efreet
-# Once done, this will define
-#
-#  EFREET_FOUND - system has Efreet installed.
-#  EFREET_INCLUDE_DIRS - directories which contain the Efreet headers.
-#  EFREET_LIBRARIES - libraries required to link against Efreet.
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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.
-
-include(EFLHelpers)
-
-FIND_EFL_LIBRARY(EFREET
-    HEADERS Efreet.h
-    HEADER_PREFIXES efreet-1
-    LIBRARY efreet
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Efreet REQUIRED_VARS EFREET_INCLUDE_DIRS EFREET_LIBRARIES
-                                         VERSION_VAR   EFREET_VERSION)
diff --git a/Source/cmake/FindEina.cmake b/Source/cmake/FindEina.cmake
deleted file mode 100644 (file)
index 37e43a0..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# - Try to find Eina
-# Once done, this will define
-#
-#  EINA_FOUND - system has Eina installed.
-#  EINA_INCLUDE_DIRS - directories which contain the Eina headers.
-#  EINA_LIBRARIES - libraries required to link against Eina.
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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.
-
-include(EFLHelpers)
-
-FIND_EFL_LIBRARY(EINA
-    HEADERS Eina.h Eina_Common.h eina_main.h
-    HEADER_PREFIXES eina-1 eina-1/eina
-    LIBRARY eina
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eina REQUIRED_VARS EINA_INCLUDE_DIRS EINA_LIBRARIES
-                                       VERSION_VAR   EINA_VERSION)
diff --git a/Source/cmake/FindElementary.cmake b/Source/cmake/FindElementary.cmake
deleted file mode 100644 (file)
index ae1d9c2..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# - Try to find Elementary
-# Once done, this will define
-#
-#  ELEMENTARY_FOUND - system has Elementary installed.
-#  ELEMENTARY_INCLUDE_DIRS - directories which contain the Elementary headers.
-#  ELEMENTARY_LIBRARIES - libraries required to link against Elementary.
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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.
-
-include(EFLHelpers)
-
-FIND_EFL_LIBRARY(ELEMENTARY
-    HEADERS Elementary.h
-    HEADER_PREFIXES elementary-1
-    LIBRARY elementary
-)
-
-# Ecore_Con is required by not WebKit/Efl but Elementary.
-FIND_EFL_LIBRARY(ECORE_CON
-    HEADERS Ecore_Con.h
-    HEADER_PREFIXES ecore-1 ecore-con-1
-    LIBRARY ecore_con
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Elementary REQUIRED_VARS ELEMENTARY_INCLUDE_DIRS ELEMENTARY_LIBRARIES ECORE_CON_INCLUDE_DIRS ECORE_CON_LIBRARIES
-                                             VERSION_VAR   ELM_VERSION)
diff --git a/Source/cmake/FindEvas.cmake b/Source/cmake/FindEvas.cmake
deleted file mode 100644 (file)
index 3dbcc4c..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# - Try to find Evas
-# Once done, this will define
-#
-#  EVAS_FOUND - system has Evas installed.
-#  EVAS_INCLUDE_DIRS - directories which contain the Evas headers.
-#  EVAS_LIBRARIES - libraries required to link against Evas.
-#
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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.
-
-include(EFLHelpers)
-
-FIND_EFL_LIBRARY(EVAS
-    HEADERS Evas.h Evas_Common.h
-    HEADER_PREFIXES evas-1
-    LIBRARY evas
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Evas REQUIRED_VARS EVAS_INCLUDE_DIRS EVAS_LIBRARIES
-                                       VERSION_VAR   EVAS_VERSION)
index c2fa762..9b27f31 100644 (file)
@@ -140,29 +140,22 @@ if (ENABLE_ECORE_X)
     add_definitions(-DMOZ_X11)
 endif ()
 
-find_package(Eo QUIET)
-if (EO_FOUND)
-    add_definitions(-DWTF_USE_EO=1)
-    set(EFL_CONFIG_MODE CONFIG)
-    set(EFL_REQUIRED_VERSION 1.8)
-else ()
-    set(EFL_REQUIRED_VERSION 1.7)
-endif ()
-
 if (ENABLE_ACCESSIBILITY)
     find_package(ATK 2.10.0 REQUIRED)
     set(EFL_REQUIRED_VERSION 1.9)
 else ()
     add_definitions(-DHAVE_ACCESSIBILITY=0)
+    set(EFL_REQUIRED_VERSION 1.8)
 endif ()
 
-find_package(Eina ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
-find_package(Evas ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
-find_package(Ecore ${EFL_REQUIRED_VERSION} COMPONENTS Evas File Input Imf Imf_Evas ${ECORE_ADDITIONAL_COMPONENTS} ${EFL_CONFIG_MODE})
-find_package(Edje ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
-find_package(Eet ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
-find_package(Eeze ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
-find_package(Efreet ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
+find_package(Eo ${EFL_REQUIRED_VERSION} REQUIRED CONFIG)
+find_package(Eina ${EFL_REQUIRED_VERSION} REQUIRED CONFIG)
+find_package(Evas ${EFL_REQUIRED_VERSION} REQUIRED CONFIG)
+find_package(Ecore ${EFL_REQUIRED_VERSION} COMPONENTS Evas File Input Imf Imf_Evas ${ECORE_ADDITIONAL_COMPONENTS} CONFIG)
+find_package(Edje ${EFL_REQUIRED_VERSION} REQUIRED CONFIG)
+find_package(Eet ${EFL_REQUIRED_VERSION} REQUIRED CONFIG)
+find_package(Eeze ${EFL_REQUIRED_VERSION} REQUIRED CONFIG)
+find_package(Efreet ${EFL_REQUIRED_VERSION} REQUIRED CONFIG)
 
 find_package(Freetype2 2.4.2 REQUIRED)
 find_package(HarfBuzz 0.9.2 REQUIRED)
@@ -187,7 +180,7 @@ if (WTF_OS_UNIX)
 endif (WTF_OS_UNIX)
 
 if (ENABLE_BATTERY_STATUS)
-    find_package(Eldbus ${EFL_REQUIRED_VERSION} ${EFL_CONFIG_MODE})
+    find_package(Eldbus ${EFL_REQUIRED_VERSION} CONFIG)
 endif ()
 
 if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)