[EFL][WK2] MiniBrowser is not built

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

Patch by Jinwoo Song <jinwoo7.song@samsung.com> on 2012-12-11
Reviewed by Gyuyoung Kim.

As we are finding an elementary package in Tools/MiniBrowser/efl/CMakeList.txt since r137203,
we need to check if the package is found in the same place not in the Tools/CMakeList.txt.

* CMakeLists.txt:
* MiniBrowser/efl/CMakeLists.txt:

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

diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
index e52105c..e5396a3 100644 (file)
--- a/Tools/CMakeLists.txt
+++ b/Tools/CMakeLists.txt
@@ -10,7 +10,7 @@ if ("${PORT}" STREQUAL "Efl")
         add_subdirectory(EWebLauncher)
     endif ()
 
-    if (ENABLE_WEBKIT2 AND ELEMENTARY_FOUND)
+    if (ENABLE_WEBKIT2)
         add_subdirectory(MiniBrowser/efl)
     endif ()
     add_subdirectory(DumpRenderTree/TestNetscapePlugIn)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 9bbf8a8..59b33e4 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2012-12-11  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        [EFL][WK2] MiniBrowser is not built
+        https://bugs.webkit.org/show_bug.cgi?id=104629
+
+        Reviewed by Gyuyoung Kim.
+
+        As we are finding an elementary package in Tools/MiniBrowser/efl/CMakeList.txt since r137203,
+        we need to check if the package is found in the same place not in the Tools/CMakeList.txt.
+
+        * CMakeLists.txt:
+        * MiniBrowser/efl/CMakeLists.txt:
+
 2012-12-11  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 
         [GTK][jhbuild] Switch to GStreamer 1.0 build

diff --git a/Tools/MiniBrowser/efl/CMakeLists.txt b/Tools/MiniBrowser/efl/CMakeLists.txt
index 96586bc..af13763 100644 (file)
--- a/Tools/MiniBrowser/efl/CMakeLists.txt
+++ b/Tools/MiniBrowser/efl/CMakeLists.txt
@@ -51,8 +51,9 @@ set(MiniBrowser_LIBRARIES
 
 add_definitions(-DTHEME_DIR=\"${THEME_BINARY_DIR}\")
 
-include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
-
-add_executable(MiniBrowser ${MiniBrowser_SOURCES})
-target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
-set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
+if (ELEMENTARY_FOUND)
+    include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
+    add_executable(MiniBrowser ${MiniBrowser_SOURCES})
+    target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
+    set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
+endif ()