Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(682)

Side by Side Diff: Source/WebCore/CMakeLists.txt

Issue 12319101: Merge 142765 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 set(WebCore_INCLUDE_DIRECTORIES 1 set(WebCore_INCLUDE_DIRECTORIES
2 "${WEBCORE_DIR}" 2 "${WEBCORE_DIR}"
3 "${WEBCORE_DIR}/Modules/battery" 3 "${WEBCORE_DIR}/Modules/battery"
4 "${WEBCORE_DIR}/Modules/filesystem" 4 "${WEBCORE_DIR}/Modules/filesystem"
5 "${WEBCORE_DIR}/Modules/gamepad" 5 "${WEBCORE_DIR}/Modules/gamepad"
6 "${WEBCORE_DIR}/Modules/geolocation" 6 "${WEBCORE_DIR}/Modules/geolocation"
7 "${WEBCORE_DIR}/Modules/indexeddb" 7 "${WEBCORE_DIR}/Modules/indexeddb"
8 "${WEBCORE_DIR}/Modules/intents" 8 "${WEBCORE_DIR}/Modules/intents"
9 "${WEBCORE_DIR}/Modules/mediasource" 9 "${WEBCORE_DIR}/Modules/mediasource"
10 "${WEBCORE_DIR}/Modules/mediastream" 10 "${WEBCORE_DIR}/Modules/mediastream"
(...skipping 2488 matching lines...) Expand 10 before | Expand all | Expand 10 after
2499 svg/SVGVKernElement.cpp 2499 svg/SVGVKernElement.cpp
2500 svg/SVGZoomAndPan.cpp 2500 svg/SVGZoomAndPan.cpp
2501 svg/SVGZoomEvent.cpp 2501 svg/SVGZoomEvent.cpp
2502 2502
2503 svg/animation/SMILTime.cpp 2503 svg/animation/SMILTime.cpp
2504 svg/animation/SMILTimeContainer.cpp 2504 svg/animation/SMILTimeContainer.cpp
2505 svg/animation/SVGSMILElement.cpp 2505 svg/animation/SVGSMILElement.cpp
2506 2506
2507 svg/graphics/SVGImage.cpp 2507 svg/graphics/SVGImage.cpp
2508 svg/graphics/SVGImageCache.cpp 2508 svg/graphics/SVGImageCache.cpp
2509 svg/graphics/SVGImageForContainer.cpp
2509 2510
2510 svg/graphics/filters/SVGFEImage.cpp 2511 svg/graphics/filters/SVGFEImage.cpp
2511 svg/graphics/filters/SVGFilter.cpp 2512 svg/graphics/filters/SVGFilter.cpp
2512 svg/graphics/filters/SVGFilterBuilder.cpp 2513 svg/graphics/filters/SVGFilterBuilder.cpp
2513 2514
2514 svg/properties/SVGAttributeToPropertyMap.cpp 2515 svg/properties/SVGAttributeToPropertyMap.cpp
2515 svg/properties/SVGPathSegListPropertyTearOff.cpp 2516 svg/properties/SVGPathSegListPropertyTearOff.cpp
2516 2517
2517 workers/AbstractWorker.cpp 2518 workers/AbstractWorker.cpp
2518 workers/DedicatedWorkerContext.cpp 2519 workers/DedicatedWorkerContext.cpp
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
3112 list(APPEND WebCore_LIBRARIES ${ANGLESupport_LIBRARY_NAME}) 3113 list(APPEND WebCore_LIBRARIES ${ANGLESupport_LIBRARY_NAME})
3113 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${ANGLESupport_LIBRARY_NAME} IGNORECXX_WARNI NGS) 3114 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${ANGLESupport_LIBRARY_NAME} IGNORECXX_WARNI NGS)
3114 endif () 3115 endif ()
3115 3116
3116 target_link_libraries(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES}) 3117 target_link_libraries(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})
3117 3118
3118 if (SHARED_CORE) 3119 if (SHARED_CORE)
3119 set_target_properties(${WebCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_V ERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 3120 set_target_properties(${WebCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_V ERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
3120 install(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}") 3121 install(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")
3121 endif () 3122 endif ()
OLDNEW
« no previous file with comments | « LayoutTests/svg/as-image/svg-image-viewbox-expected.html ('k') | Source/WebCore/GNUmakefile.list.am » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698