Changeset 86283 in webkit

Timestamp:

May 11, 2011 4:28:08 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-11 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Antonio Gomes.

[CMAKE] Move EFL-specific file to CMakeListsEfl.txt
​https://bugs.webkit.org/show_bug.cgi?id=60642

Move file EFL-specific file to the CMakeListsEfl.txt file. This implies
having to include CMakeLists${PORT}.txt before the ADD_CUSTOM_COMMAND
calls, since they depend on lists that now may change inside a port
like WebCore_USER_AGENT_STYLE_SHEETS.

No new tests since no change in functionality.

• CMakeLists.txt: remove css file specific to EFL port.
• CMakeListsEfl.txt: move file here.

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (4 diffs)
• CMakeListsEfl.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -1412 +1412 @@
     ${WEBCORE_DIR}/css/mathml.css
     ${WEBCORE_DIR}/css/mediaControls.css
-    ${WEBCORE_DIR}/css/mediaControlsEfl.css
     ${WEBCORE_DIR}/css/quirks.css
     ${WEBCORE_DIR}/css/svg.css
@@ -1954 +1953 @@
 
 INCLUDE(${WEBCORE_DIR}/UseJSC.cmake)
- 
+
+SET(WebCore_LIBRARIES ${JavaScriptCore_LIBRARY_NAME})
+SET(WebCore_LINK_FLAGS "")
+INCLUDE_IF_EXISTS(${WEBCORE_DIR}/CMakeLists${PORT}.txt)
+
+
 # All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
 ADD_CUSTOM_COMMAND(
@@ -2109 +2113 @@
 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
 
-
 ADD_CUSTOM_COMMAND(
     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
@@ -2119 +2122 @@
 
 
-SET(WebCore_LIBRARIES
-    ${JavaScriptCore_LIBRARY_NAME}
-)
-
-
-SET(WebCore_LINK_FLAGS "")
-INCLUDE_IF_EXISTS(${WEBCORE_DIR}/CMakeLists${PORT}.txt)
 
 WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})

trunk/Source/WebCore/CMakeListsEfl.txt

@@ -77 +77 @@
 )
 
+LIST(APPEND WebCore_USER_AGENT_STYLE_SHEETS
+    ${WEBCORE_DIR}/css/mediaControlsEfl.css
+)
+
 IF (WTF_USE_CAIRO)
   LIST(APPEND WebCore_INCLUDE_DIRECTORIES

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-11  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [CMAKE] Move EFL-specific file to CMakeListsEfl.txt
+        https://bugs.webkit.org/show_bug.cgi?id=60642
+
+        Move file EFL-specific file to the CMakeListsEfl.txt file. This implies
+        having to include CMakeLists${PORT}.txt before the ADD_CUSTOM_COMMAND
+        calls, since they depend on lists that now may change inside a port
+        like WebCore_USER_AGENT_STYLE_SHEETS.
+
+        No new tests since no change in functionality.
+
+        * CMakeLists.txt: remove css file specific to EFL port.
+        * CMakeListsEfl.txt: move file here.
+
 2011-05-11  Tao Bai  <michaelbai@chromium.org>