[CMake] Merge WebKitEfl.cmake into FindEFL.cmake.

https://bugs.webkit.org/show_bug.cgi?id=78566

Reviewed by Daniel Bates.

.:

* Source/cmake/FindEFL.cmake: Move the code to find edje_cc here from
WebKitEfl.cmake.
* Source/cmake/WebKitEfl.cmake: Removed.

Source/WebKit/efl:

* CMakeListsEfl.txt: Do not include WebKitEfl.cmake.

Source/WebKit2:

* PlatformEfl.cmake: Do not include WebKitEfl.cmake.

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

diff --git a/ChangeLog b/ChangeLog
index 8a37fd9..27da3d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-13  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Merge WebKitEfl.cmake into FindEFL.cmake.
+        https://bugs.webkit.org/show_bug.cgi?id=78566
+
+        Reviewed by Daniel Bates.
+
+        * Source/cmake/FindEFL.cmake: Move the code to find edje_cc here from
+        WebKitEfl.cmake.
+        * Source/cmake/WebKitEfl.cmake: Removed.
+
 2012-02-14  Shinya Kawanaka  <shinyak@google.com>
 
         Use youngestShadowRoot and oldestShadowRoot instead of Element::shadowRoot().

diff --git a/Source/WebKit/efl/CMakeListsEfl.txt b/Source/WebKit/efl/CMakeListsEfl.txt
index 4dea270..20dcc35 100644 (file)
--- a/Source/WebKit/efl/CMakeListsEfl.txt
+++ b/Source/WebKit/efl/CMakeListsEfl.txt
@@ -1,5 +1,3 @@
-INCLUDE(WebKitEfl)
-
 LIST(APPEND WebKit_LINK_FLAGS
     ${ECORE_X_LDFLAGS}
     ${EDJE_LDFLAGS}

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index 3f8edc1..0da81d9 100644 (file)
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-13  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Merge WebKitEfl.cmake into FindEFL.cmake.
+        https://bugs.webkit.org/show_bug.cgi?id=78566
+
+        Reviewed by Daniel Bates.
+
+        * CMakeListsEfl.txt: Do not include WebKitEfl.cmake.
+
 2012-02-11  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         Convert svg/animations to use SMIL methods for driving the timeline

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index bda56ea..c26e7a3 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-13  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Merge WebKitEfl.cmake into FindEFL.cmake.
+        https://bugs.webkit.org/show_bug.cgi?id=78566
+
+        Reviewed by Daniel Bates.
+
+        * PlatformEfl.cmake: Do not include WebKitEfl.cmake.
+
 2012-02-14  No'am Rosenthal  <noam.rosenthal@nokia.com>
 
         [Qt][Texmap] Refactor backing-store code in TextureMapper

diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
index adaeeab..d8a797a 100644 (file)
--- a/Source/WebKit2/PlatformEfl.cmake
+++ b/Source/WebKit2/PlatformEfl.cmake
@@ -1,5 +1,3 @@
-INCLUDE(WebKitEfl)
-
 LIST(APPEND WebKit2_LINK_FLAGS
     ${ECORE_X_LDFLAGS}
     ${EDJE_LDFLAGS}

diff --git a/Source/cmake/FindEFL.cmake b/Source/cmake/FindEFL.cmake
index 8b12065..cdd64a6 100644 (file)
--- a/Source/cmake/FindEFL.cmake
+++ b/Source/cmake/FindEFL.cmake
@@ -14,3 +14,7 @@ PKG_CHECK_MODULES (EINA REQUIRED eina>=1.0.0)
 PKG_CHECK_MODULES (ECORE_X ecore-x>=1.0.0)
 PKG_CHECK_MODULES (EVAS REQUIRED evas>=1.0.0)
 
+FIND_PROGRAM (EDJE_CC_EXECUTABLE edje_cc)
+IF (NOT EDJE_CC_EXECUTABLE)
+    MESSAGE (FATAL_ERROR "edje_cc could not be found")
+ENDIF ()

diff --git a/Source/cmake/WebKitEfl.cmake b/Source/cmake/WebKitEfl.cmake
deleted file mode 100644 (file)
index 06bd060..0000000
--- a/Source/cmake/WebKitEfl.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# EFL port specific macros and definitions
-
-FIND_PROGRAM(EDJE_CC_EXECUTABLE edje_cc)
-IF (NOT EDJE_CC_EXECUTABLE)
-  MESSAGE(FATAL_ERROR "Missing edje_cc")
-ENDIF ()