[CMake] Remove unnecessary ENABLE_WEBCORE switch
authorgyuyoung.kim@webkit.org <gyuyoung.kim@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Apr 2015 08:36:50 +0000 (08:36 +0000)
committergyuyoung.kim@webkit.org <gyuyoung.kim@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Apr 2015 08:36:50 +0000 (08:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=143584

Reviewed by Csaba Osztrogon√°c.

WebCore should be built for all ports. So ENABLE_WEBCORE switch looks be redundant.
Remove it.

* CMakeLists.txt:
* Source/CMakeLists.txt:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitFS.cmake:

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

CMakeLists.txt
ChangeLog
Source/CMakeLists.txt
Source/cmake/OptionsGTK.cmake
Source/cmake/WebKitFS.cmake

index 301013431fccd9f698be4fae7bde0d392d583e94..e22d6d76902be9344833554166a6eae0ca4e2c95 100644 (file)
@@ -24,8 +24,6 @@ set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
-set(ENABLE_WEBCORE ON)
-
 if (NOT DEFINED ENABLE_WEBKIT)
     set(ENABLE_WEBKIT ON)
 endif ()
index f87caab43342e4eb827e52a39cdffd9e6c418f10..525526a8ff9b90376fc17c954de830e9c11fca9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2015-04-10  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
+
+        [CMake] Remove unnecessary ENABLE_WEBCORE switch
+        https://bugs.webkit.org/show_bug.cgi?id=143584
+
+        Reviewed by Csaba Osztrogon√°c.
+
+        WebCore should be built for all ports. So ENABLE_WEBCORE switch looks be redundant.
+        Remove it.
+
+        * CMakeLists.txt:
+        * Source/CMakeLists.txt:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/WebKitFS.cmake:
+
 2015-04-08  Filip Pizlo  <fpizlo@apple.com>
 
         Unreviewed, revert accidental commit.
index ceddfb16af8a88065f0ecd2ac182a0bbeee25e59..68cf801f2d8d943adb5647cb74e26a18205f4a8c 100644 (file)
@@ -10,14 +10,12 @@ add_subdirectory(WTF)
 
 add_subdirectory(JavaScriptCore)
 
+add_subdirectory(WebCore)
+
 if (ENABLE_API_TESTS)
     add_subdirectory(ThirdParty/gtest)
 endif ()
 
-if (ENABLE_WEBCORE)
-    add_subdirectory(WebCore)
-endif ()
-
 if (ENABLE_WEBKIT)
     add_subdirectory(WebKit)
 endif ()
@@ -34,11 +32,8 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(bmalloc ${ADDITIONAL_COMPILER_FLAGS})
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WTF ${ADDITIONAL_COMPILER_FLAGS})
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(JavaScriptCore ${ADDITIONAL_COMPILER_FLAGS})
-
-if (ENABLE_WEBCORE)
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreTestSupport ${ADDITIONAL_COMPILER_FLAGS})
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCore ${ADDITIONAL_COMPILER_FLAGS})
-endif ()
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreTestSupport ${ADDITIONAL_COMPILER_FLAGS})
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCore ${ADDITIONAL_COMPILER_FLAGS})
 
 if (ENABLE_WEBKIT)
     WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_COMPILER_FLAGS})
index fff4edc56b2689c60bebd84b785bc1478016f3f3..12fa47215ff642ea02c41f1826f20cabd7ba250b 100644 (file)
@@ -230,7 +230,6 @@ if (ENABLE_WAYLAND_TARGET)
     add_definitions(-DWTF_PLATFORM_WAYLAND=1)
 endif ()
 
-set(ENABLE_WEBCORE ON)
 set(ENABLE_WEBKIT OFF)
 set(ENABLE_WEBKIT2 ON)
 set(ENABLE_PLUGIN_PROCESS ON)
index e821c663d71b5a5a05137799d891613285a8f0b0..1c4c87dae8da8566a248e1d0060fc6f6cc05acb5 100644 (file)
@@ -2,14 +2,11 @@ file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WTF_DIR})
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
 
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/Protocol)
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
 
-if (ENABLE_WEBCORE)
-    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
-endif ()
-
 if (ENABLE_WEBKIT2)
     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
 endif ()