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.

Canonical link: https://commits.webkit.org/75940@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@86283 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt

@@ -1411,7 +1411,6 @@ SET(WebCore_USER_AGENT_STYLE_SHEETS
     ${WEBCORE_DIR}/css/html.css
     ${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
     ${WEBCORE_DIR}/css/view-source.css
@@ -1953,7 +1952,12 @@ SET(SCRIPTS_BINDINGS
 )
 
 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(
     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.idl
@@ -2108,7 +2112,6 @@ LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNSNames.cpp)
 GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
 
-
 ADD_CUSTOM_COMMAND(
     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
     MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
@@ -2118,13 +2121,6 @@ ADD_CUSTOM_COMMAND(
 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
 
 
-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})
 ADD_DEFINITIONS(-DBUILDING_WebCore)

Source/WebCore/CMakeListsEfl.txt

@@ -76,6 +76,10 @@ LIST(APPEND WebCore_SOURCES
   plugins/PluginDataNone.cpp
 )
 
+LIST(APPEND WebCore_USER_AGENT_STYLE_SHEETS
+    ${WEBCORE_DIR}/css/mediaControlsEfl.css
+)
+
 IF (WTF_USE_CAIRO)
   LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/cairo"

Source/WebCore/ChangeLog

@@ -1,3 +1,20 @@
+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>
 
         Reviewed by David Kilzer.