[CMake] Enable to build WebKit sources without Tools

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

Patch by Laszlo Gombos <l.gombos@samsung.com> on 2012-12-05
Reviewed by Gyuyoung Kim.

Turn on building Tools by default only if ENABLE_TOOLS is not explicitly set
(enabled or disabled) and the Tools directory exists for all CMake based ports.

This change enables the possibility to build WebKit even if the Tools directory
does not exists.

* CMakeLists.txt:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f8378e595d4e6ce312ff8189eb3fa0f88e62f06..00e3da75e6492579ebdc5db2510005496ee025c3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,14 +11,6 @@ ENDIF ()
 # -----------------------------------------------------------------------------
 # Default library type
 # -----------------------------------------------------------------------------
-SET(ENABLE_WEBCORE ON)
-
-IF (NOT DEFINED ENABLE_WEBKIT)
-    SET(ENABLE_WEBKIT ON)
-ENDIF ()
-
-SET(ENABLE_TOOLS ON)
-
 SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
@@ -36,6 +28,16 @@ SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
+SET(ENABLE_WEBCORE ON)
+
+IF (NOT DEFINED ENABLE_WEBKIT)
+    SET(ENABLE_WEBKIT ON)
+ENDIF ()
+
+IF (NOT DEFINED ENABLE_TOOLS AND EXISTS ${TOOLS_DIR})
+    SET(ENABLE_TOOLS ON)
+ENDIF()
+
 INCLUDE(WebKitMacros)
 INCLUDE(WebKitFS)
 INCLUDE(WebKitHelpers)

diff --git a/ChangeLog b/ChangeLog
index 15a10d9bb168c91555cea807034acc67ac4b728a..a49b5b5e4c99a6bb28d2ff7ed7277bc5da99ddd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2012-12-05  Laszlo Gombos  <l.gombos@samsung.com>
+
+        [CMake] Enable to build WebKit sources without Tools
+        https://bugs.webkit.org/show_bug.cgi?id=103918
+
+        Reviewed by Gyuyoung Kim.
+
+        Turn on building Tools by default only if ENABLE_TOOLS is not explicitly set
+        (enabled or disabled) and the Tools directory exists for all CMake based ports.
+
+        This change enables the possibility to build WebKit even if the Tools directory 
+        does not exists.
+
+        * CMakeLists.txt:
+
 2012-12-04  Kondapally Kalyan  <kalyan.kondapally@intel.com>
 
         [EFL][WK2][AC] USE_GRAPHICS_SURFACE should be enabled only if Xcomposite and Xrender extensions are found.