[EFL] ImageDiff does not build on WebKit2 only builds
authorthiago.santos@intel.com <thiago.santos@intel.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Dec 2012 15:49:25 +0000 (15:49 +0000)
committerthiago.santos@intel.com <thiago.santos@intel.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Dec 2012 15:49:25 +0000 (15:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=105288

Reviewed by Kenneth Rohde Christiansen.

Moved ImageDiff to the efl/ folder inside Tools/ (so we don't pollute
the folder with things which are EFL-specific.

ImageDiff will be built by default now regardless of WebKit API flavor
you choose.

* CMakeLists.txt:
* DumpRenderTree/efl/CMakeLists.txt:
* efl/ImageDiff/CMakeLists.txt: Added.
* efl/ImageDiff/ImageDiff.cpp: Renamed from Tools/DumpRenderTree/efl/ImageDiff.cpp.

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

Tools/CMakeLists.txt
Tools/ChangeLog
Tools/DumpRenderTree/efl/CMakeLists.txt
Tools/efl/ImageDiff/CMakeLists.txt [new file with mode: 0644]
Tools/efl/ImageDiff/ImageDiff.cpp [moved from Tools/DumpRenderTree/efl/ImageDiff.cpp with 100% similarity]

index e5396a3..dbf19ee 100644 (file)
@@ -3,6 +3,7 @@ if (ENABLE_WEBKIT2)
 endif ()
 
 if ("${PORT}" STREQUAL "Efl")
+    add_subdirectory(efl/ImageDiff)
     add_subdirectory(EWebLauncher/ControlTheme)
 
     if (ENABLE_WEBKIT)
index c172ff1..85b755b 100644 (file)
@@ -1,3 +1,21 @@
+2012-12-18  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        [EFL] ImageDiff does not build on WebKit2 only builds
+        https://bugs.webkit.org/show_bug.cgi?id=105288
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Moved ImageDiff to the efl/ folder inside Tools/ (so we don't pollute
+        the folder with things which are EFL-specific.
+
+        ImageDiff will be built by default now regardless of WebKit API flavor
+        you choose.
+
+        * CMakeLists.txt:
+        * DumpRenderTree/efl/CMakeLists.txt:
+        * efl/ImageDiff/CMakeLists.txt: Added.
+        * efl/ImageDiff/ImageDiff.cpp: Renamed from Tools/DumpRenderTree/efl/ImageDiff.cpp.
+
 2012-12-18  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 
         [EFL][WK2] When creating new windows, use the opener's context
index 668b442..d236d0d 100644 (file)
@@ -21,10 +21,6 @@ set(DumpRenderTree_SOURCES
     ${TOOLS_DIR}/DumpRenderTree/efl/WorkQueueItemEfl.cpp
 )
 
-set(ImageDiff_SOURCES
-    ${TOOLS_DIR}/DumpRenderTree/efl/ImageDiff.cpp
-)
-
 set(DumpRenderTree_LIBRARIES
     ${JavaScriptCore_LIBRARY_NAME}
     ${WebCoreTestSupport_LIBRARY_NAME}
@@ -124,7 +120,3 @@ include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
 add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
 target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
 set_target_properties(DumpRenderTree PROPERTIES FOLDER "Tools")
-
-add_executable(ImageDiff ${ImageDiff_SOURCES})
-target_link_libraries(ImageDiff ${DumpRenderTree_LIBRARIES})
-set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
diff --git a/Tools/efl/ImageDiff/CMakeLists.txt b/Tools/efl/ImageDiff/CMakeLists.txt
new file mode 100644 (file)
index 0000000..bcbc17f
--- /dev/null
@@ -0,0 +1,25 @@
+set(ImageDiff_SOURCES
+    ${TOOLS_DIR}/efl/ImageDiff/ImageDiff.cpp
+)
+
+set(ImageDiff_LIBRARIES
+    ${ECORE_EVAS_LIBRARIES}
+    ${ECORE_LIBRARIES}
+    ${EINA_LIBRARIES}
+    ${EVAS_LIBRARIES}
+    ${WTF_LIBRARY_NAME}
+)
+
+set(ImageDiff_INCLUDE_DIRECTORIES
+    ${CMAKE_BINARY_DIR}
+    ${ECORE_EVAS_INCLUDE_DIRS}
+    ${ECORE_INCLUDE_DIRS}
+    ${EINA_INCLUDE_DIRS}
+    ${EVAS_INCLUDE_DIRS}
+    ${WTF_DIR}
+)
+
+include_directories(${ImageDiff_INCLUDE_DIRECTORIES})
+add_executable(ImageDiff ${ImageDiff_SOURCES})
+target_link_libraries(ImageDiff ${ImageDiff_LIBRARIES})
+set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")