Changeset 75069 in webkit


Ignore:
Timestamp:
Jan 5, 2011 8:55:13 AM (13 years ago)
Author:
Patrick Gansterer
Message:

2011-01-05 Patrick Gansterer <Patrick Gansterer>

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 <Patrick Gansterer>

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 <Patrick Gansterer>

Reviewed by Andreas Kling.

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

  • CMakeLists.txt:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r75067 r75069  
     12011-01-05  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [CMake] Fix the usage of SOURCE_GROUP
     6        https://bugs.webkit.org/show_bug.cgi?id=51739
     7
     8        * Source/cmake/WebKitMacros.cmake:
     9
    1102011-01-05  Patrick Gansterer  <paroga@webkit.org>
    211

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r74600 r75069  
    240240
    241241
    242 # Declare source groups for Visual Studio folders
    243 SOURCE_GROUP(API "API/")
    244 SOURCE_GROUP(assembler "assembler/")
    245 SOURCE_GROUP(bytecode "bytecode/")
    246 SOURCE_GROUP(bytecompiler "bytecompiler/")
    247 SOURCE_GROUP(debugger "debugger/")
    248 SOURCE_GROUP(bytecode "bytecode/")
    249 SOURCE_GROUP(interpreter "interpreter/")
    250 SOURCE_GROUP(jit "jit/")
    251 SOURCE_GROUP(parser "parser/")
    252 SOURCE_GROUP(pcre "pcre/")
    253 SOURCE_GROUP(profiler "profiler/")
    254 SOURCE_GROUP(runtime "runtime/")
    255 SOURCE_GROUP(yarr "yarr/")
    256 SOURCE_GROUP(wtf "wtf/")
    257 
    258242ADD_SUBDIRECTORY(wtf)
    259243ADD_SUBDIRECTORY(shell)

  • trunk/Source/JavaScriptCore/ChangeLog

    r75068 r75069  
     12011-01-05  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [CMake] Fix the usage of SOURCE_GROUP
     6        https://bugs.webkit.org/show_bug.cgi?id=51739
     7
     8        * CMakeLists.txt:
     9
    1102011-01-05  Andras Becsi  <abecsi@webkit.org>
    211

  • trunk/Source/cmake/WebKitMacros.cmake

    • Property svn:eol-style set to native
    r72908 r75069  
    104104ENDMACRO()
    105105
    106 MACRO (WEBKIT_WRAP_SOURCELIST _input)
    107     IF (WTF_PLATFORM_QT)
    108         FOREACH (_file ${ARGN})
    109             GET_FILENAME_COMPONENT(_basename ${_file} NAME_WE)
     106MACRO (WEBKIT_WRAP_SOURCELIST)
     107    FOREACH (_file ${ARGN})
     108        GET_FILENAME_COMPONENT(_basename ${_file} NAME_WE)
     109        GET_FILENAME_COMPONENT(_path ${_file} PATH)
     110
     111                IF (NOT _file MATCHES "${DERIVED_SOURCES_DIR}")
     112            STRING(REGEX REPLACE "/" "\\\\\\\\" _sourcegroup "${_path}")
     113            SOURCE_GROUP("${_sourcegroup}" FILES ${_file})
     114                ENDIF ()
     115
     116        IF (WTF_PLATFORM_QT)
    110117            SET(_moc_filename ${DERIVED_SOURCES_DIR}/${_basename}.moc)
    111118
    … …  
    117124                ADD_SOURCE_DEPENDENCIES(${_file} ${_moc_filename})
    118125            ENDIF ()
    119         ENDFOREACH ()
    120     ENDIF ()
     126        ENDIF ()
     127    ENDFOREACH ()
     128
     129    SOURCE_GROUP("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_DIR}")
    121130ENDMACRO ()

  • trunk/WebCore/CMakeLists.txt

    r75031 r75069  
    22212221
    22222222
    2223 # Declare source groups for Visual Studio folders
    2224 SOURCE_GROUP(accessibility "accessibility/")
    2225 SOURCE_GROUP(bindings "bindings/")
    2226 SOURCE_GROUP(bridge "bridge/")
    2227 SOURCE_GROUP(Configurations "Configurations/")
    2228 SOURCE_GROUP(css "css/")
    2229 SOURCE_GROUP(dom "dom/")
    2230 SOURCE_GROUP(editing "editing/")
    2231 SOURCE_GROUP(ForwardingHeaders "ForwardingHeaders/")
    2232 SOURCE_GROUP(history "history/")
    2233 SOURCE_GROUP(html "html/")
    2234 SOURCE_GROUP(icu "icu/")
    2235 SOURCE_GROUP(inspector "inspector/")
    2236 SOURCE_GROUP(JavaScriptCore "Source/JavaScriptCore/")
    2237 SOURCE_GROUP(loader "loader/")
    2238 SOURCE_GROUP(manual-tests "manual-tests/")
    2239 SOURCE_GROUP(mathml "mathml/")
    2240 SOURCE_GROUP(notifications "notifications/")
    2241 SOURCE_GROUP(page "page/")
    2242 SOURCE_GROUP(platform "platform/")
    2243 SOURCE_GROUP(plugins "plugins/")
    2244 SOURCE_GROUP(Programs "Programs/")
    2245 SOURCE_GROUP(rendering "rendering/")
    2246 SOURCE_GROUP(Resources "Resources/")
    2247 SOURCE_GROUP(SharedScript "SharedScript/")
    2248 SOURCE_GROUP(storage "storage/")
    2249 SOURCE_GROUP(svg "svg/")
    2250 SOURCE_GROUP(WebCore "WebCore/")
    2251 SOURCE_GROUP(websockets "websockets/")
    2252 SOURCE_GROUP(wml "wml/")
    2253 SOURCE_GROUP(workers "workers/")
    2254 SOURCE_GROUP(xml "xml/")
    2255 
    22562223SET(WebCore_LINK_FLAGS "")
    22572224INCLUDE_IF_EXISTS(${WEBCORE_DIR}/CMakeLists${PORT}.txt)
    22582225
     2226WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
    22592227ADD_DEFINITIONS(-DBUILDING_WebCore)
    22602228INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})

  • trunk/WebCore/ChangeLog

    r75068 r75069  
     12011-01-05  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [CMake] Fix the usage of SOURCE_GROUP
     6        https://bugs.webkit.org/show_bug.cgi?id=51739
     7
     8        * CMakeLists.txt:
     9
    1102011-01-05  Andras Becsi  <abecsi@webkit.org>
    211
Note: See TracChangeset for help on using the changeset viewer.