Unreviewed attempt to fix EFL and Mac/cmake builds after r209665.

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

Source/WebKit2:

* PlatformEfl.cmake: WebKit2 should precede other target so that right
config.h comes first in include path.

Tools:

* DumpRenderTree/CMakeLists.txt: WebKit2 should precede other target
so that right config.h comes first in include path.

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 9b215e6..8ab8566 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2016-12-11  Konstantin Tokarev  <annulen@yandex.ru>
+
+        Unreviewed attempt to fix EFL and Mac/cmake builds after r209665.
+        https://bugs.webkit.org/show_bug.cgi?id=165686
+
+        * PlatformEfl.cmake: WebKit2 should precede other target so that right
+        config.h comes first in include path.
+
 2016-12-11  Tim Horton  <timothy_horton@apple.com>
 
         Quarter-second stalls scrolling images that are links because of sync getPositionInformation

diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
index 9270500..932e911 100644 (file)
--- a/Source/WebKit2/PlatformEfl.cmake
+++ b/Source/WebKit2/PlatformEfl.cmake
@@ -455,10 +455,10 @@ set(EWK2UnitTests_LIBRARIES
     ${GLIB_GTHREAD_LIBRARIES}
     ${GLIB_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
+    WebKit2
     JavaScriptCore
     WTF
     WebCore
-    WebKit2
     gtest
 )
 

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d22161e..a49b1c3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,11 @@
+2016-12-11  Konstantin Tokarev  <annulen@yandex.ru>
+
+        Unreviewed attempt to fix EFL and Mac/cmake builds after r209665.
+        https://bugs.webkit.org/show_bug.cgi?id=165686
+
+        * DumpRenderTree/CMakeLists.txt: WebKit2 should precede other target
+        so that right config.h comes first in include path.
+
 2016-12-11  Dave Hyatt  <hyatt@apple.com>
 
         [CSS Parser] Make sure content extensions initialize AtomicString

diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt
index 104b9d8..a34ba0a 100644 (file)
--- a/Tools/DumpRenderTree/CMakeLists.txt
+++ b/Tools/DumpRenderTree/CMakeLists.txt
@@ -21,8 +21,8 @@ set(DumpRenderTree_SOURCES
 )
 
 set(DumpRenderTree_LIBRARIES
-    JavaScriptCore
     WebCoreTestSupport
+    JavaScriptCore
 )
 
 set(DumpRenderTree_INCLUDE_DIRECTORIES