[CMAKE] Do not build Tools when building jsc only.

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

Reviewed by Daniel Bates.

Do not build Tools when jsc is only built. Build breaks occur because
Tools is built together when building jsc.

* CMakeLists.txt: Build Tools directory when ENABLE_TOOLS is on.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c13086747e05782f06c6e63323defd87a67ea34a..5bc473d0602fad5901627e855844b7259698fd7b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,11 +17,14 @@ IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
     SET(ENABLE_WEBKIT On)
 ENDIF ()
 
+SET(ENABLE_TOOLS On)
+
 OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build JavaScriptCore")
 IF (ONLY_BUILD_JAVASCRIPTCORE)
     SET(ENABLE_WEBCORE Off)
     SET(ENABLE_WEBKIT Off)
     SET(ENABLE_WEBKIT2 Off)
+    SET(ENABLE_TOOLS Off)
 ENDIF ()
 
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
@@ -152,7 +155,9 @@ ADD_SUBDIRECTORY(Source)
 # -----------------------------------------------------------------------------
 # Add tools
 # -----------------------------------------------------------------------------
-ADD_SUBDIRECTORY(Tools)
+IF (ENABLE_TOOLS)
+    ADD_SUBDIRECTORY(Tools)
+ENDIF ()
 
 # -----------------------------------------------------------------------------
 # Prints a summary of all enabled/disabled features

diff --git a/ChangeLog b/ChangeLog
index dfc413b3d931a06471bfe92a40811ce404e77ac2..a818e86e6b3f41d5772495887fe61a373bb8e7a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-02-05  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE] Do not build Tools when building jsc only. 
+        https://bugs.webkit.org/show_bug.cgi?id=77826
+
+        Reviewed by Daniel Bates.
+
+        Do not build Tools when jsc is only built. Build breaks occur because
+        Tools is built together when building jsc.
+
+        * CMakeLists.txt: Build Tools directory when ENABLE_TOOLS is on.
+
 2012-02-04  Philip Rogers  <pdr@google.com>
 
         Fix bug in svg-link-hover-use.svg