Changeset 137203 in webkit

Timestamp:

Dec 10, 2012 1:53:55 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Change the minimum required EFL version to 1.6
​https://bugs.webkit.org/show_bug.cgi?id=104431

Patch by Laszlo Gombos <​l.gombos@samsung.com> on 2012-12-10
Reviewed by Kenneth Rohde Christiansen.

.:

Change the minimum required EFL version to 1.6 from 1.7 to enable
building on Tizen.

The elementary EFL package is only required to build MiniBrowser,
so I moved the required only to the Minibrowser CMake file.

• Source/cmake/OptionsEfl.cmake:

Tools:

Change the minimum required EFL version to 1.6 from 1.7.
The elementary EFL package is only required to build MiniBrowser,
so I moved the required only to the Minibrowser CMake file.

• MiniBrowser/efl/CMakeLists.txt: In addition removed

ENABLE_GLIB_SUPPORT as it is obsolete and it was always set to be on.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/efl/CMakeLists.txt (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-12-10  Laszlo Gombos  <l.gombos@samsung.com>
+
+        [EFL] Change the minimum required EFL version to 1.6
+        https://bugs.webkit.org/show_bug.cgi?id=104431
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Change the minimum required EFL version to 1.6 from 1.7 to enable
+        building on Tizen.
+
+        The elementary EFL package is only required to build MiniBrowser,
+        so I moved the required only to the Minibrowser CMake file.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2012-12-10  Alexis Menard  <alexis@webkit.org>
 

trunk/Source/cmake/OptionsEfl.cmake

@@ -112 +112 @@
 endif ()
 
-find_package(Eina 1.7 REQUIRED)
-find_package(Evas 1.7 REQUIRED)
-find_package(Ecore 1.7 COMPONENTS Evas File Input ${ECORE_ADDITIONAL_COMPONENTS})
-find_package(Edje 1.7 REQUIRED)
-find_package(Eet 1.7 REQUIRED)
-find_package(Eeze 1.7 REQUIRED)
-find_package(Efreet 1.7 REQUIRED)
-find_package(E_DBus 1.7 COMPONENTS EUKit)
-
-# Elementary is needed to build MiniBrowser
-find_package(Elementary 1.7)
+# Allow building the EFL port using EFL version 1.6+ to build on Tizen trunk
+find_package(Eina 1.6 REQUIRED)
+find_package(Evas 1.6 REQUIRED)
+find_package(Ecore 1.6 COMPONENTS Evas File Input ${ECORE_ADDITIONAL_COMPONENTS})
+find_package(Edje 1.6 REQUIRED)
+find_package(Eet 1.6 REQUIRED)
+find_package(Eeze 1.6 REQUIRED)
+find_package(Efreet 1.6 REQUIRED)
+find_package(E_DBus 1.6 COMPONENTS EUKit)
+
+# Prefer and promote EFL version 1.7+ as the reference configuration
+if ((${EINA_VERSION} STRLESS 1.7) OR (${EVAS_VERSION} STRLESS 1.7) OR (${ECORE_VERSION} STRLESS 1.7) OR (${EDJE_VERSION} STRLESS 1.7) OR
+    (${EET_VERSION} STRLESS 1.7) OR (${EEZE_VERSION} STRLESS 1.7) OR (${EFREET_VERSION} STRLESS 1.7) OR (${E_DBUS_VERSION} STRLESS 1.7))
+    message("Consider updating all EFL libaries to v1.7")
+endif ()
 
 find_package(Freetype 2.4.2 REQUIRED)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-12-10  Laszlo Gombos  <l.gombos@samsung.com>
+
+        [EFL] Change the minimum required EFL version to 1.6
+        https://bugs.webkit.org/show_bug.cgi?id=104431
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Change the minimum required EFL version to 1.6 from 1.7.
+        The elementary EFL package is only required to build MiniBrowser,
+        so I moved the required only to the Minibrowser CMake file.
+
+        * MiniBrowser/efl/CMakeLists.txt: In addition removed
+        ENABLE_GLIB_SUPPORT as it is obsolete and it was always set to be on.
+
 2012-12-10  Dean Jackson  <dino@apple.com>
 

trunk/Tools/MiniBrowser/efl/CMakeLists.txt

@@ -1 +1 @@
 set(MiniBrowser_DIR "${TOOLS_DIR}/MiniBrowser/efl")
+
+# Elementary is needed to build MiniBrowser
+find_package(Elementary 1.6)
 
 set(MiniBrowser_SOURCES
@@ -38 +41 @@
     ${EVAS_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
+    ${GLIB_LIBRARIES}
+    ${GLIB_GTHREAD_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
     ${LIBXML2_LIBRARIES}
@@ -44 +49 @@
     ${SQLITE_LIBRARIES}
 )
-
-if (ENABLE_GLIB_SUPPORT)
-    list(APPEND MiniBrowser_LIBRARIES
-        ${GLIB_LIBRARIES}
-        ${GLIB_GTHREAD_LIBRARIES}
-    )
-endif ()
 
 add_definitions(-DTHEME_DIR=\"${THEME_BINARY_DIR}\")