2011-01-05 Patrick Gansterer <paroga@webkit.org>

        Reviewed by Andreas Kling.

        [CMake] Fix the usage of SOURCE_GROUP
        https://bugs.webkit.org/show_bug.cgi?id=51739

        * Source/cmake/WebKitMacros.cmake:
2011-01-05  Patrick Gansterer  <paroga@webkit.org>

        Reviewed by Andreas Kling.

        [CMake] Fix the usage of SOURCE_GROUP
        https://bugs.webkit.org/show_bug.cgi?id=51739

        * CMakeLists.txt:
2011-01-05  Patrick Gansterer  <paroga@webkit.org>

        Reviewed by Andreas Kling.

        [CMake] Fix the usage of SOURCE_GROUP
        https://bugs.webkit.org/show_bug.cgi?id=51739

        * CMakeLists.txt:

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

diff --git a/ChangeLog b/ChangeLog
index b4ca18d8181ebfc8e8daba8a4deb7ef9031ba8c1..ee45908b87317b61b7a391d27e9763b0e03da09a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-05  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [CMake] Fix the usage of SOURCE_GROUP
+        https://bugs.webkit.org/show_bug.cgi?id=51739
+
+        * Source/cmake/WebKitMacros.cmake:
+
 2011-01-05  Patrick Gansterer  <paroga@webkit.org>
 
         Reviewed by Andreas Kling.

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index 5abd7653e925850f72cbeb1e04d8a3a3d4757327..f8b4d1e0aa7e2d2a11dfc828d1d9f0219ac36692 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -239,22 +239,6 @@ ENDIF ()
 INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/CMakeLists${PORT}.txt)
 
 
-# Declare source groups for Visual Studio folders
-SOURCE_GROUP(API "API/")
-SOURCE_GROUP(assembler "assembler/")
-SOURCE_GROUP(bytecode "bytecode/")
-SOURCE_GROUP(bytecompiler "bytecompiler/")
-SOURCE_GROUP(debugger "debugger/")
-SOURCE_GROUP(bytecode "bytecode/")
-SOURCE_GROUP(interpreter "interpreter/")
-SOURCE_GROUP(jit "jit/")
-SOURCE_GROUP(parser "parser/")
-SOURCE_GROUP(pcre "pcre/")
-SOURCE_GROUP(profiler "profiler/")
-SOURCE_GROUP(runtime "runtime/")
-SOURCE_GROUP(yarr "yarr/")
-SOURCE_GROUP(wtf "wtf/")
-
 ADD_SUBDIRECTORY(wtf)
 ADD_SUBDIRECTORY(shell)
 

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index b5b08e339627361610220cbe068fa780b30c02ca..dde99a5f7d00aa5034908dcd29c5b124f9349915 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-05  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [CMake] Fix the usage of SOURCE_GROUP
+        https://bugs.webkit.org/show_bug.cgi?id=51739
+
+        * CMakeLists.txt:
+
 2011-01-05  Andras Becsi  <abecsi@webkit.org>
 
         Reviewed by Csaba Osztrogonác.

diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
index 235031ba5ae329f784503b2ad16efe2c3d24c5e1..75a87a65c91afaeb4104d002ba3b064cdad77dba 100644 (file)
--- a/Source/cmake/WebKitMacros.cmake
+++ b/Source/cmake/WebKitMacros.cmake
@@ -103,10 +103,17 @@ MACRO(MAKE_HASH_TOOLS _source)
     UNSET(_hash_tools_h)
 ENDMACRO()
 
-MACRO (WEBKIT_WRAP_SOURCELIST _input)
-    IF (WTF_PLATFORM_QT)
-        FOREACH (_file ${ARGN})
-            GET_FILENAME_COMPONENT(_basename ${_file} NAME_WE)
+MACRO (WEBKIT_WRAP_SOURCELIST)
+    FOREACH (_file ${ARGN})
+        GET_FILENAME_COMPONENT(_basename ${_file} NAME_WE)
+        GET_FILENAME_COMPONENT(_path ${_file} PATH)
+
+               IF (NOT _file MATCHES "${DERIVED_SOURCES_DIR}")
+            STRING(REGEX REPLACE "/" "\\\\\\\\" _sourcegroup "${_path}")
+            SOURCE_GROUP("${_sourcegroup}" FILES ${_file})
+               ENDIF ()
+
+        IF (WTF_PLATFORM_QT)
             SET(_moc_filename ${DERIVED_SOURCES_DIR}/${_basename}.moc)
 
             FILE(READ ${_file} _contents)
@@ -116,6 +123,8 @@ MACRO (WEBKIT_WRAP_SOURCELIST _input)
                 QT4_GENERATE_MOC(${_file} ${_moc_filename})
                 ADD_SOURCE_DEPENDENCIES(${_file} ${_moc_filename})
             ENDIF ()
-        ENDFOREACH ()
-    ENDIF ()
+        ENDIF ()
+    ENDFOREACH ()
+
+    SOURCE_GROUP("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_DIR}")
 ENDMACRO ()

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index b950e8fa027feed191795d599db1847b36e50e3e..0be0bb8bcfee0a2dcc2a5e17acf87759c58134bc 100644 (file)
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -2220,42 +2220,10 @@ SET(WebCore_LIBRARIES
 )
 
 
-# Declare source groups for Visual Studio folders
-SOURCE_GROUP(accessibility "accessibility/")
-SOURCE_GROUP(bindings "bindings/")
-SOURCE_GROUP(bridge "bridge/")
-SOURCE_GROUP(Configurations "Configurations/")
-SOURCE_GROUP(css "css/")
-SOURCE_GROUP(dom "dom/")
-SOURCE_GROUP(editing "editing/")
-SOURCE_GROUP(ForwardingHeaders "ForwardingHeaders/")
-SOURCE_GROUP(history "history/")
-SOURCE_GROUP(html "html/")
-SOURCE_GROUP(icu "icu/")
-SOURCE_GROUP(inspector "inspector/")
-SOURCE_GROUP(JavaScriptCore "Source/JavaScriptCore/")
-SOURCE_GROUP(loader "loader/")
-SOURCE_GROUP(manual-tests "manual-tests/")
-SOURCE_GROUP(mathml "mathml/")
-SOURCE_GROUP(notifications "notifications/")
-SOURCE_GROUP(page "page/")
-SOURCE_GROUP(platform "platform/")
-SOURCE_GROUP(plugins "plugins/")
-SOURCE_GROUP(Programs "Programs/")
-SOURCE_GROUP(rendering "rendering/")
-SOURCE_GROUP(Resources "Resources/")
-SOURCE_GROUP(SharedScript "SharedScript/")
-SOURCE_GROUP(storage "storage/")
-SOURCE_GROUP(svg "svg/")
-SOURCE_GROUP(WebCore "WebCore/")
-SOURCE_GROUP(websockets "websockets/")
-SOURCE_GROUP(wml "wml/")
-SOURCE_GROUP(workers "workers/")
-SOURCE_GROUP(xml "xml/")
-
 SET(WebCore_LINK_FLAGS "")
 INCLUDE_IF_EXISTS(${WEBCORE_DIR}/CMakeLists${PORT}.txt)
 
+WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
 ADD_DEFINITIONS(-DBUILDING_WebCore)
 INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})
 ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6f577bdf1c87bd4466bbbc1e8f3deb9b7587d63c..d09e87a51617c78559a2dcf4dad036c1d4fe928a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-05  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [CMake] Fix the usage of SOURCE_GROUP
+        https://bugs.webkit.org/show_bug.cgi?id=51739
+
+        * CMakeLists.txt:
+
 2011-01-05  Andras Becsi  <abecsi@webkit.org>
 
         Reviewed by Csaba Osztrogonác.