Source/WebCore/CMakeLists.txt - Issue 10447082: Merge 117971

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

Issue 10447082: Merge 117971 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 6 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:

OLD	NEW
1 SET(WebCore_INCLUDE_DIRECTORIES	1 SET(WebCore_INCLUDE_DIRECTORIES

2 "${WEBCORE_DIR}"	2 "${WEBCORE_DIR}"

3 "${WEBCORE_DIR}/Modules/filesystem"	3 "${WEBCORE_DIR}/Modules/filesystem"

4 "${WEBCORE_DIR}/Modules/geolocation"	4 "${WEBCORE_DIR}/Modules/geolocation"

5 "${WEBCORE_DIR}/Modules/indexeddb"	5 "${WEBCORE_DIR}/Modules/indexeddb"

6 "${WEBCORE_DIR}/Modules/webaudio"	6 "${WEBCORE_DIR}/Modules/webaudio"

7 "${WEBCORE_DIR}/Modules/webdatabase"	7 "${WEBCORE_DIR}/Modules/webdatabase"

8 "${WEBCORE_DIR}/Modules/websockets"	8 "${WEBCORE_DIR}/Modules/websockets"

9 "${WEBCORE_DIR}/accessibility"	9 "${WEBCORE_DIR}/accessibility"

10 "${WEBCORE_DIR}/bindings"	10 "${WEBCORE_DIR}/bindings"

(...skipping 1778 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1789 rendering/svg/RenderSVGResourceSolidColor.cpp	1789 rendering/svg/RenderSVGResourceSolidColor.cpp

1790 rendering/svg/RenderSVGRoot.cpp	1790 rendering/svg/RenderSVGRoot.cpp

1791 rendering/svg/RenderSVGShape.cpp	1791 rendering/svg/RenderSVGShape.cpp

1792 rendering/svg/RenderSVGTSpan.cpp	1792 rendering/svg/RenderSVGTSpan.cpp

1793 rendering/svg/RenderSVGText.cpp	1793 rendering/svg/RenderSVGText.cpp

1794 rendering/svg/RenderSVGTextPath.cpp	1794 rendering/svg/RenderSVGTextPath.cpp

1795 rendering/svg/RenderSVGTransformableContainer.cpp	1795 rendering/svg/RenderSVGTransformableContainer.cpp

1796 rendering/svg/RenderSVGViewportContainer.cpp	1796 rendering/svg/RenderSVGViewportContainer.cpp

1797 rendering/svg/SVGInlineFlowBox.cpp	1797 rendering/svg/SVGInlineFlowBox.cpp

1798 rendering/svg/SVGInlineTextBox.cpp	1798 rendering/svg/SVGInlineTextBox.cpp

1799 rendering/svg/SVGMarkerLayoutInfo.cpp

1800 rendering/svg/SVGPathData.cpp	1799 rendering/svg/SVGPathData.cpp

1801 rendering/svg/SVGRenderSupport.cpp	1800 rendering/svg/SVGRenderSupport.cpp

1802 rendering/svg/SVGRenderTreeAsText.cpp	1801 rendering/svg/SVGRenderTreeAsText.cpp

1803 rendering/svg/SVGRenderingContext.cpp	1802 rendering/svg/SVGRenderingContext.cpp

1804 rendering/svg/SVGResources.cpp	1803 rendering/svg/SVGResources.cpp

1805 rendering/svg/SVGResourcesCache.cpp	1804 rendering/svg/SVGResourcesCache.cpp

1806 rendering/svg/SVGResourcesCycleSolver.cpp	1805 rendering/svg/SVGResourcesCycleSolver.cpp

1807 rendering/svg/SVGRootInlineBox.cpp	1806 rendering/svg/SVGRootInlineBox.cpp

1808 rendering/svg/SVGTextChunk.cpp	1807 rendering/svg/SVGTextChunk.cpp

1809 rendering/svg/SVGTextChunkBuilder.cpp	1808 rendering/svg/SVGTextChunkBuilder.cpp

(...skipping 931 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2741	2740

2742 IF (WebCore_LINK_FLAGS)	2741 IF (WebCore_LINK_FLAGS)

2743 ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLA GS}")	2742 ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLA GS}")

2744 ADD_TARGET_PROPERTIES(${WebCoreTestSupport_LIBRARY_NAME} LINK_FLAGS "${WebCo re_LINK_FLAGS}")	2743 ADD_TARGET_PROPERTIES(${WebCoreTestSupport_LIBRARY_NAME} LINK_FLAGS "${WebCo re_LINK_FLAGS}")

2745 ENDIF ()	2744 ENDIF ()

2746	2745

2747 IF (SHARED_CORE)	2746 IF (SHARED_CORE)

2748 SET_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_V ERSION} SOVERSION ${PROJECT_VERSION_MAJOR})	2747 SET_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_V ERSION} SOVERSION ${PROJECT_VERSION_MAJOR})

2749 INSTALL(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")	2748 INSTALL(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")

2750 ENDIF ()	2749 ENDIF ()

OLD	NEW

« no previous file with comments | « LayoutTests/svg/custom/marker-zero-length-linecaps-expected.svg ('k') | Source/WebCore/GNUmakefile.list.am » ('j') | no next file with comments »