[EFL] Move ImageDiff to the Tools directory root
authorthiago.santos@intel.com <thiago.santos@intel.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Dec 2012 15:05:46 +0000 (15:05 +0000)
committerthiago.santos@intel.com <thiago.santos@intel.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Dec 2012 15:05:46 +0000 (15:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=105305

Reviewed by Laszlo Gombos.

We previously moved this directory from the DRT directory to
efl/ImageDiff. The major reason for doing so was because ImageDiff does
not depend on DumpRenderTree but for legacy reasons was living inside the
DRT folder, even though it is needed when running pixel tests for WK2.

Now we are moving to Tool directory root as other ports agreed to do the same.

* CMakeLists.txt:
* ImageDiff/CMakeLists.txt: Added.
* ImageDiff/PlatformEfl.cmake: Added.
* ImageDiff/efl/ImageDiff.cpp: Renamed from Tools/efl/ImageDiff/ImageDiff.cpp.
* efl/ImageDiff/CMakeLists.txt: Removed.

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

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

index dbf19ee..d0527d4 100644 (file)
@@ -3,7 +3,7 @@ if (ENABLE_WEBKIT2)
 endif ()
 
 if ("${PORT}" STREQUAL "Efl")
-    add_subdirectory(efl/ImageDiff)
+    add_subdirectory(ImageDiff)
     add_subdirectory(EWebLauncher/ControlTheme)
 
     if (ENABLE_WEBKIT)
index bb3533b..64a30dc 100644 (file)
@@ -1,3 +1,23 @@
+2012-12-19  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        [EFL] Move ImageDiff to the Tools directory root
+        https://bugs.webkit.org/show_bug.cgi?id=105305
+
+        Reviewed by Laszlo Gombos.
+
+        We previously moved this directory from the DRT directory to
+        efl/ImageDiff. The major reason for doing so was because ImageDiff does
+        not depend on DumpRenderTree but for legacy reasons was living inside the
+        DRT folder, even though it is needed when running pixel tests for WK2.
+
+        Now we are moving to Tool directory root as other ports agreed to do the same.
+
+        * CMakeLists.txt:
+        * ImageDiff/CMakeLists.txt: Added.
+        * ImageDiff/PlatformEfl.cmake: Added.
+        * ImageDiff/efl/ImageDiff.cpp: Renamed from Tools/efl/ImageDiff/ImageDiff.cpp.
+        * efl/ImageDiff/CMakeLists.txt: Removed.
+
 2012-12-19  Zeno Albisser  <zeno@webkit.org>
 
         [Qt][Mac] run-launcher cannot find Qt5WebKitWidgets.
diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f23c3c7
--- /dev/null
@@ -0,0 +1,17 @@
+set(IMAGE_DIFF_DIR "${TOOLS_DIR}/ImageDiff")
+
+set(IMAGE_DIFF_INCLUDE_DIRECTORIES
+    ${CMAKE_BINARY_DIR}
+    ${WTF_DIR}
+)
+
+set(IMAGE_DIFF_LIBRARIES
+    ${WTF_LIBRARY_NAME}
+)
+
+INCLUDE_IF_EXISTS(${IMAGE_DIFF_DIR}/Platform${PORT}.cmake)
+
+include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
+add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
+target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
+set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
diff --git a/Tools/ImageDiff/PlatformEfl.cmake b/Tools/ImageDiff/PlatformEfl.cmake
new file mode 100644 (file)
index 0000000..4af46f4
--- /dev/null
@@ -0,0 +1,17 @@
+set(IMAGE_DIFF_SOURCES
+    ${IMAGE_DIFF_DIR}/efl/ImageDiff.cpp
+)
+
+list(APPEND IMAGE_DIFF_INCLUDE_DIRECTORIES
+    ${ECORE_EVAS_INCLUDE_DIRS}
+    ${ECORE_INCLUDE_DIRS}
+    ${EINA_INCLUDE_DIRS}
+    ${EVAS_INCLUDE_DIRS}
+)
+
+list(APPEND IMAGE_DIFF_LIBRARIES
+    ${ECORE_EVAS_LIBRARIES}
+    ${ECORE_LIBRARIES}
+    ${EINA_LIBRARIES}
+    ${EVAS_LIBRARIES}
+)
diff --git a/Tools/efl/ImageDiff/CMakeLists.txt b/Tools/efl/ImageDiff/CMakeLists.txt
deleted file mode 100644 (file)
index bcbc17f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-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")