ChangeLog

 12010-12-30 Patrick Gansterer <paroga@webkit.org>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 [CMake] Fix the usage of SOURCE_GROUP
 6 https://bugs.webkit.org/show_bug.cgi?id=51739
 7
 8 * Sources/cmake/WebKitMacros.cmake:
 9
1102010-12-29 Patrick Gansterer <paroga@webkit.org>
211
312 Unreviewed. Use gcc as default preprocessor.

JavaScriptCore/CMakeLists.txt

@@ENDIF ()
239239INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/CMakeLists${PORT}.txt)
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)
260244

JavaScriptCore/ChangeLog

 12010-12-30 Patrick Gansterer <paroga@webkit.org>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 [CMake] Fix the usage of SOURCE_GROUP
 6 https://bugs.webkit.org/show_bug.cgi?id=51739
 7
 8 * CMakeLists.txt:
 9
1102010-12-29 Gavin Barraclough <barraclough@apple.com>
211
312 Reviewed by Sam Weinig.

Sources/cmake/WebKitMacros.cmake

@@MACRO(MAKE_HASH_TOOLS _source)
103103 UNSET(_hash_tools_h)
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
112119 FILE(READ ${_file} _contents)

@@MACRO (WEBKIT_WRAP_SOURCELIST _input)
116123 QT4_GENERATE_MOC(${_file} ${_moc_filename})
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 ()

WebCore/CMakeLists.txt

@@SET(WebCore_LIBRARIES
22152215)
22162216
22172217
2218 # Declare source groups for Visual Studio folders
2219 SOURCE_GROUP(accessibility "accessibility/")
2220 SOURCE_GROUP(bindings "bindings/")
2221 SOURCE_GROUP(bridge "bridge/")
2222 SOURCE_GROUP(Configurations "Configurations/")
2223 SOURCE_GROUP(css "css/")
2224 SOURCE_GROUP(dom "dom/")
2225 SOURCE_GROUP(editing "editing/")
2226 SOURCE_GROUP(ForwardingHeaders "ForwardingHeaders/")
2227 SOURCE_GROUP(history "history/")
2228 SOURCE_GROUP(html "html/")
2229 SOURCE_GROUP(icu "icu/")
2230 SOURCE_GROUP(inspector "inspector/")
2231 SOURCE_GROUP(JavaScriptCore "JavaScriptCore/")
2232 SOURCE_GROUP(loader "loader/")
2233 SOURCE_GROUP(manual-tests "manual-tests/")
2234 SOURCE_GROUP(mathml "mathml/")
2235 SOURCE_GROUP(notifications "notifications/")
2236 SOURCE_GROUP(page "page/")
2237 SOURCE_GROUP(platform "platform/")
2238 SOURCE_GROUP(plugins "plugins/")
2239 SOURCE_GROUP(Programs "Programs/")
2240 SOURCE_GROUP(rendering "rendering/")
2241 SOURCE_GROUP(Resources "Resources/")
2242 SOURCE_GROUP(SharedScript "SharedScript/")
2243 SOURCE_GROUP(storage "storage/")
2244 SOURCE_GROUP(svg "svg/")
2245 SOURCE_GROUP(WebCore "WebCore/")
2246 SOURCE_GROUP(websockets "websockets/")
2247 SOURCE_GROUP(wml "wml/")
2248 SOURCE_GROUP(workers "workers/")
2249 SOURCE_GROUP(xml "xml/")
2250 
22512218SET(WebCore_LINK_FLAGS "")
22522219INCLUDE_IF_EXISTS(${WEBCORE_DIR}/CMakeLists${PORT}.txt)
22532220
 2221WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
22542222ADD_DEFINITIONS(-DBUILDING_WebCore)
22552223INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})
22562224ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})

WebCore/ChangeLog

 12010-12-30 Patrick Gansterer <paroga@webkit.org>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 [CMake] Fix the usage of SOURCE_GROUP
 6 https://bugs.webkit.org/show_bug.cgi?id=51739
 7
 8 * CMakeLists.txt:
 9
1102010-12-29 Dirk Schulze <krit@webkit.org>
211
312 Reviewed by Darin Adler.