Title: [136715] trunk
- Revision
- 136715
- Author
- [email protected]
- Date
- 2012-12-05 10:59:16 -0800 (Wed, 05 Dec 2012)
Log Message
[CMake] Enable to build WebKit sources without Tools
https://bugs.webkit.org/show_bug.cgi?id=103918
Patch by Laszlo Gombos <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (136714 => 136715)
--- trunk/CMakeLists.txt 2012-12-05 18:52:18 UTC (rev 136714)
+++ trunk/CMakeLists.txt 2012-12-05 18:59:16 UTC (rev 136715)
@@ -11,14 +11,6 @@
# -----------------------------------------------------------------------------
# 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(_javascript_CORE_DIR "${CMAKE_SOURCE_DIR}/Source/_javascript_Core")
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
@@ -36,6 +28,16 @@
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)
Modified: trunk/ChangeLog (136714 => 136715)
--- trunk/ChangeLog 2012-12-05 18:52:18 UTC (rev 136714)
+++ trunk/ChangeLog 2012-12-05 18:59:16 UTC (rev 136715)
@@ -1,3 +1,18 @@
+2012-12-05 Laszlo Gombos <[email protected]>
+
+ [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 <[email protected]>
[EFL][WK2][AC] USE_GRAPHICS_SURFACE should be enabled only if Xcomposite and Xrender extensions are found.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
