Changeset 244292 in webkit


Ignore:
Timestamp:
Apr 15, 2019 2:46:36 PM (5 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake] WebCore derived sources should only be referenced inside WebCore
​https://bugs.webkit.org/show_bug.cgi?id=196904

Reviewed by Konstantin Tokarev.

.:

Override WebCore_DERIVED_SOURCES_DIR for WinCairo.

  • Source/cmake/OptionsWinCairo.cmake:

Source/WebCore:

Use WebCore_DERIVED_SOURCES_DIR instead of DERIVED_SOURCES_WEBCORE_DIR.

  • CMakeLists.txt:
  • PlatformGTK.cmake:
  • PlatformWin.cmake:
  • WebCoreMacros.cmake:

Source/WebCore/PAL:

Specify PAL_DERIVED_SOURCES_DIR as a private include directory.

  • pal/CMakeLists.txt:
  • pal/PlatformWin.cmake:

Source/WebKit:

Remove reference to DERIVED_SOURCES_WEBCORE_DIR in PlatformMac.cmake.

  • PlatformMac.cmake:
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r244245 r244292  
     12019-04-15  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] WebCore derived sources should only be referenced inside WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=196904
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Override WebCore_DERIVED_SOURCES_DIR for WinCairo.
     9
     10        * Source/cmake/OptionsWinCairo.cmake:
     11
    1122019-04-14  Don Olmstead  <don.olmstead@sony.com>
    213

  • trunk/Source/WebCore/CMakeLists.txt

    r244245 r244292  
    1616)
    1717
     18set(WebCore_PRIVATE_INCLUDE_DIRECTORIES
     19    "${CMAKE_BINARY_DIR}"
     20)
     21
    1822set(WebCore_INCLUDE_DIRECTORIES
    19     "${CMAKE_BINARY_DIR}"
     23    "${WebCore_DERIVED_SOURCES_DIR}"
    2024    "${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
    2125    "${PAL_FRAMEWORK_HEADERS_DIR}"
    … …  
    159163    "${WEBCORE_DIR}/xml"
    160164    "${WEBCORE_DIR}/xml/parser"
    161     "${DERIVED_SOURCES_WEBCORE_DIR}"
    162165)
    163166
    … …  
    16831686    "${WEBCORE_DIR}/testing"
    16841687    "${WEBCORE_DIR}/testing/js"
    1685     "${DERIVED_SOURCES_WEBCORE_DIR}"
     1688    "${WebCore_DERIVED_SOURCES_DIR}"
    16861689)
    16871690
    … …  
    17441747    ${WEBCORE_DIR}/bindings/scripts/StaticString.pm
    17451748)
    1746 set(SUPPLEMENTAL_DEPENDENCY_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/supplemental_dependency.tmp)
    1747 set(WINDOW_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowConstructors.idl)
    1748 set(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/WorkerGlobalScopeConstructors.idl)
    1749 set(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DedicatedWorkerGlobalScopeConstructors.idl)
    1750 set(SERVICEWORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/ServiceWorkerGlobalScopeConstructors.idl)
    1751 set(WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/WorkletGlobalScopeConstructors.idl)
    1752 set(PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/PaintWorkletGlobalScopeConstructors.idl)
     1749set(SUPPLEMENTAL_DEPENDENCY_FILE ${WebCore_DERIVED_SOURCES_DIR}/supplemental_dependency.tmp)
     1750set(WINDOW_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/DOMWindowConstructors.idl)
     1751set(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/WorkerGlobalScopeConstructors.idl)
     1752set(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/DedicatedWorkerGlobalScopeConstructors.idl)
     1753set(SERVICEWORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/ServiceWorkerGlobalScopeConstructors.idl)
     1754set(WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/WorkletGlobalScopeConstructors.idl)
     1755set(PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/PaintWorkletGlobalScopeConstructors.idl)
    17531756
    17541757WEBKIT_FRAMEWORK_DECLARE(WebCore)
    … …  
    17581761# Generate CommandLineAPIModuleSource.h
    17591762add_custom_command(
    1760     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
     1763    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.h ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.min.js
    17611764    MAIN_DEPENDENCY inspector/CommandLineAPIModuleSource.js
    17621765    DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
    1763     COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_CommandLineAPIModuleSource.js" > ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
    1764     COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBCORE_DIR}/inspector/CommandLineAPIModuleSource.js >> ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
    1765     COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl CommandLineAPIModuleSource_js ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h
     1766    COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_CommandLineAPIModuleSource.js" > ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.min.js
     1767    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBCORE_DIR}/inspector/CommandLineAPIModuleSource.js >> ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.min.js
     1768    COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl CommandLineAPIModuleSource_js ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.min.js ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.h
    17661769    VERBATIM)
    1767 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h)
     1770list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.h)
    17681771
    17691772
    17701773MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData)
    1771 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/ColorData.cpp)
     1774list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/ColorData.cpp)
    17721775
    17731776
    17741777# Generate DOMJITAbstractHeapRepository.h
    17751778add_custom_command(
    1776     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/DOMJITAbstractHeapRepository.h
     1779    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/DOMJITAbstractHeapRepository.h
    17771780    MAIN_DEPENDENCY domjit/DOMJITAbstractHeapRepository.yaml
    17781781    DEPENDS ${WEBCORE_DIR}/domjit/generate-abstract-heap.rb
    1779     COMMAND ${RUBY_EXECUTABLE} ${WEBCORE_DIR}/domjit/generate-abstract-heap.rb ${WEBCORE_DIR}/domjit/DOMJITAbstractHeapRepository.yaml ${DERIVED_SOURCES_WEBCORE_DIR}/DOMJITAbstractHeapRepository.h
     1782    COMMAND ${RUBY_EXECUTABLE} ${WEBCORE_DIR}/domjit/generate-abstract-heap.rb ${WEBCORE_DIR}/domjit/DOMJITAbstractHeapRepository.yaml ${WebCore_DERIVED_SOURCES_DIR}/DOMJITAbstractHeapRepository.h
    17801783    VERBATIM)
    1781 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/DOMJITAbstractHeapRepository.h)
     1784list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/DOMJITAbstractHeapRepository.h)
    17821785
    17831786# Generate XMLViewerCSS.h
    17841787add_custom_command(
    1785     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.css
     1788    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/XMLViewerCSS.h ${WebCore_DERIVED_SOURCES_DIR}/XMLViewer.min.css
    17861789    MAIN_DEPENDENCY xml/XMLViewer.css
    17871790    DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py
    1788     COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py < ${WEBCORE_DIR}/xml/XMLViewer.css > ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.css
    1789     COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl XMLViewer_css ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.css ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h
     1791    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py < ${WEBCORE_DIR}/xml/XMLViewer.css > ${WebCore_DERIVED_SOURCES_DIR}/XMLViewer.min.css
     1792    COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl XMLViewer_css ${WebCore_DERIVED_SOURCES_DIR}/XMLViewer.min.css ${WebCore_DERIVED_SOURCES_DIR}/XMLViewerCSS.h
    17901793    VERBATIM)
    1791 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h)
     1794list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLViewerCSS.h)
    17921795
    17931796# Generate XMLViewerJS.h
    17941797add_custom_command(
    1795     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js
     1798    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/XMLViewerJS.h ${WebCore_DERIVED_SOURCES_DIR}/XMLViewer.min.js
    17961799    MAIN_DEPENDENCY xml/XMLViewer.js
    17971800    DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
    1798     COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBCORE_DIR}/xml/XMLViewer.js > ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js
    1799     COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl XMLViewer_js ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h
     1801    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBCORE_DIR}/xml/XMLViewer.js > ${WebCore_DERIVED_SOURCES_DIR}/XMLViewer.min.js
     1802    COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl XMLViewer_js ${WebCore_DERIVED_SOURCES_DIR}/XMLViewer.min.js ${WebCore_DERIVED_SOURCES_DIR}/XMLViewerJS.h
    18001803    VERBATIM)
    1801 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h)
     1804list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLViewerJS.h)
    18021805
    18031806# Generate HTML entity table
    18041807add_custom_command(
    1805     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp
     1808    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp
    18061809    MAIN_DEPENDENCY ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
    18071810    DEPENDS ${WEBCORE_DIR}/html/parser/create-html-entity-table
    1808     COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/html/parser/create-html-entity-table -o ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
     1811    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/html/parser/create-html-entity-table -o ${WebCore_DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
    18091812    VERBATIM)
    1810 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp)
     1813list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp)
    18111814
    18121815# Generate HTTP header names
    18131816add_custom_command(
    1814     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.gperf ${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.h
     1817    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/HTTPHeaderNames.cpp ${WebCore_DERIVED_SOURCES_DIR}/HTTPHeaderNames.gperf ${WebCore_DERIVED_SOURCES_DIR}/HTTPHeaderNames.h
    18151818    MAIN_DEPENDENCY ${WEBCORE_DIR}/platform/network/HTTPHeaderNames.in
    18161819    DEPENDS ${WEBCORE_DIR}/platform/network/create-http-header-name-table
    1817     WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
     1820    WORKING_DIRECTORY ${WebCore_DERIVED_SOURCES_DIR}
    18181821    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/platform/network/create-http-header-name-table ${WEBCORE_DIR}/platform/network/HTTPHeaderNames.in "${GPERF_EXECUTABLE}"
    18191822    VERBATIM)
    1820 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.cpp)
     1823list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/HTTPHeaderNames.cpp)
    18211824
    18221825# Generate CSS property names
    18231826add_custom_command(
    1824     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CSSProperties.json ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.gperf ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/StylePropertyShorthandFunctions.h ${DERIVED_SOURCES_WEBCORE_DIR}/StylePropertyShorthandFunctions.cpp
     1827    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/CSSProperties.json ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.h ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.gperf ${WebCore_DERIVED_SOURCES_DIR}/StyleBuilder.cpp ${WebCore_DERIVED_SOURCES_DIR}/StylePropertyShorthandFunctions.h ${WebCore_DERIVED_SOURCES_DIR}/StylePropertyShorthandFunctions.cpp
    18251828    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl
    18261829    DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
    1827     WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
    1828     COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSProperties.json
     1830    WORKING_DIRECTORY ${WebCore_DERIVED_SOURCES_DIR}
     1831    COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${WebCore_DERIVED_SOURCES_DIR}/CSSProperties.json
    18291832    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --gperf-executable "${GPERF_EXECUTABLE}"
    18301833    VERBATIM)
    1831 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
    1832 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp)
    1833 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StylePropertyShorthandFunctions.cpp)
     1834list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp)
     1835list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/StyleBuilder.cpp)
     1836list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/StylePropertyShorthandFunctions.cpp)
    18341837ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
    18351838
    18361839# Generate CSS value keywords
    18371840add_custom_command(
    1838     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.gperf
     1841    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.in ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.h ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.gperf
    18391842    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makevalues.pl
    18401843    DEPENDS ${WebCore_CSS_VALUE_KEYWORDS}
    1841     WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
    1842     COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in
     1844    WORKING_DIRECTORY ${WebCore_DERIVED_SOURCES_DIR}
     1845    COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_VALUE_KEYWORDS} > ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.in
    18431846    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${CSS_VALUE_PLATFORM_DEFINES}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --gperf-executable "${GPERF_EXECUTABLE}"
    18441847    VERBATIM)
    1845 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
     1848list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp)
    18461849ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
    18471850ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h)
    … …  
    18491852# Generate CSS Selector pseudo type name to value maps.
    18501853add_custom_command(
    1851     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.gperf ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp
     1854    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/SelectorPseudoClassAndCompatibilityElementMap.gperf ${WebCore_DERIVED_SOURCES_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp
    18521855    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/SelectorPseudoClassAndCompatibilityElementMap.in
    18531856    DEPENDS ${WEBCORE_DIR}/css/makeSelectorPseudoClassAndCompatibilityElementMap.py
    1854     WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
     1857    WORKING_DIRECTORY ${WebCore_DERIVED_SOURCES_DIR}
    18551858    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/css/makeSelectorPseudoClassAndCompatibilityElementMap.py ${WEBCORE_DIR}/css/SelectorPseudoClassAndCompatibilityElementMap.in "${GPERF_EXECUTABLE}" "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
    18561859    VERBATIM)
    1857 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp)
     1860list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp)
    18581861add_custom_command(
    1859     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.gperf ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.cpp
     1862    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/SelectorPseudoElementTypeMap.gperf ${WebCore_DERIVED_SOURCES_DIR}/SelectorPseudoElementTypeMap.cpp
    18601863    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/SelectorPseudoElementTypeMap.in
    18611864    DEPENDS ${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py
    1862     WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
     1865    WORKING_DIRECTORY ${WebCore_DERIVED_SOURCES_DIR}
    18631866    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py ${WEBCORE_DIR}/css/SelectorPseudoElementTypeMap.in "${GPERF_EXECUTABLE}" "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
    18641867    VERBATIM)
    1865 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.cpp)
     1868list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/SelectorPseudoElementTypeMap.cpp)
    18661869
    18671870# Generate user agent styles
    18681871add_custom_command(
    1869     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h
     1872    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h
    18701873    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl
    18711874    DEPENDS ${WebCore_USER_AGENT_STYLE_SHEETS} ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
    1872     COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS}
     1875    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WebCore_DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h ${WebCore_DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS}
    18731876    VERBATIM)
    1874 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp)
     1877list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp)
    18751878ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
    18761879
    … …  
    18821885
    18831886    MAKE_JS_FILE_ARRAYS(
    1884         ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScriptsData.cpp
    1885         ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h
     1887        ${WebCore_DERIVED_SOURCES_DIR}/UserAgentScriptsData.cpp
     1888        ${WebCore_DERIVED_SOURCES_DIR}/UserAgentScripts.h
    18861889        WebCore
    18871890        WebCore_USER_AGENT_SCRIPTS
    18881891        WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES
    18891892    )
    1890     list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScriptsData.cpp)
     1893    list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/UserAgentScriptsData.cpp)
    18911894endif ()
    18921895
    18931896# Generate plug-in resources
    18941897add_custom_command(
    1895     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResources.h
     1898    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/PlugInsResourcesData.cpp ${WebCore_DERIVED_SOURCES_DIR}/PlugInsResources.h
    18961899    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl
    18971900    DEPENDS ${WebCore_PLUG_INS_RESOURCES} ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
    1898     COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResources.h ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp ${WebCore_PLUG_INS_RESOURCES}
     1901    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WebCore_DERIVED_SOURCES_DIR}/PlugInsResources.h ${WebCore_DERIVED_SOURCES_DIR}/PlugInsResourcesData.cpp ${WebCore_PLUG_INS_RESOURCES}
    18991902    VERBATIM)
    1900 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp)
     1903list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/PlugInsResourcesData.cpp)
    19011904ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp PlugInsResourcesData.cpp PlugInsResources.h)
    19021905
    19031906set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
    1904 list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl)
     1907list(APPEND WebCoreTestSupport_IDL_FILES ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.idl)
    19051908
    19061909GENERATE_BINDINGS(WebCoreBindings
    … …  
    19081911    INPUT_FILES ${WebCore_IDL_FILES}
    19091912    BASE_DIR ${WEBCORE_DIR}
    1910     IDL_INCLUDES ${WebCore_IDL_INCLUDES} ${DERIVED_SOURCES_WEBCORE_DIR}
     1913    IDL_INCLUDES ${WebCore_IDL_INCLUDES} ${WebCore_DERIVED_SOURCES_DIR}
    19111914    FEATURES ${FEATURE_DEFINES_JAVASCRIPT}
    1912     DESTINATION ${DERIVED_SOURCES_WEBCORE_DIR}
     1915    DESTINATION ${WebCore_DERIVED_SOURCES_DIR}
    19131916    GENERATOR JS
    19141917    SUPPLEMENTAL_DEPFILE ${SUPPLEMENTAL_DEPENDENCY_FILE}
    … …  
    19271930    INPUT_FILES ${WebCoreTestSupport_IDL_FILES}
    19281931    BASE_DIR ${WEBCORE_DIR}
    1929     IDL_INCLUDES ${WebCore_IDL_INCLUDES} ${DERIVED_SOURCES_WEBCORE_DIR} ${WebCoreTestSupport_IDL_INCLUDES}
     1932    IDL_INCLUDES ${WebCore_IDL_INCLUDES} ${WebCore_DERIVED_SOURCES_DIR} ${WebCoreTestSupport_IDL_INCLUDES}
    19301933    FEATURES ${FEATURE_DEFINES_JAVASCRIPT}
    1931     DESTINATION ${DERIVED_SOURCES_WEBCORE_DIR}
     1934    DESTINATION ${WebCore_DERIVED_SOURCES_DIR}
    19321935    GENERATOR JS)
    19331936
    … …  
    19761979    get_filename_component(_objectName ${_builtinSource} NAME_WE)
    19771980    add_custom_command(
    1978         OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.cpp
    1979                ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h
     1981        OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/${_objectName}Builtins.cpp
     1982               ${WebCore_DERIVED_SOURCES_DIR}/${_objectName}Builtins.h
    19801983        MAIN_DEPENDENCY ${_builtinSource}
    19811984        DEPENDS ${BUILTINS_GENERATOR_SCRIPTS}
    1982         COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework WebCore --output-directory ${DERIVED_SOURCES_WEBCORE_DIR} ${_builtinSource}
     1985        COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework WebCore --output-directory ${WebCore_DERIVED_SOURCES_DIR} ${_builtinSource}
    19831986        VERBATIM)
    1984     list(APPEND WebCore_DERIVED_BUILTIN_HEADERS ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h)
     1987    list(APPEND WebCore_DERIVED_BUILTIN_HEADERS ${WebCore_DERIVED_SOURCES_DIR}/${_objectName}Builtins.h)
    19851988endforeach ()
    19861989
    19871990add_custom_command(
    1988     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp
    1989            ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.cpp
    1990            ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h
    1991            ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h
     1991    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.cpp
     1992           ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.cpp
     1993           ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.h
     1994           ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h
    19921995    MAIN_DEPENDENCY ${WebCore_BUILTINS_SOURCES}
    19931996    DEPENDS ${BUILTINS_GENERATOR_SCRIPTS} ${WebCore_DERIVED_BUILTIN_HEADERS}
    1994     COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --wrappers-only --framework WebCore --output-directory ${DERIVED_SOURCES_WEBCORE_DIR} ${WebCore_BUILTINS_SOURCES}
     1997    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --wrappers-only --framework WebCore --output-directory ${WebCore_DERIVED_SOURCES_DIR} ${WebCore_BUILTINS_SOURCES}
    19951998    VERBATIM)
    19961999list(APPEND WebCore_SOURCES
    1997     ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp
    1998     ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.cpp
    1999     ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h
    2000     ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h)
     2000    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.cpp
     2001    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.cpp
     2002    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.h
     2003    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h)
    20012004
    20022005ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
    … …  
    20042007
    20052008GENERATE_DOM_NAMES(HTML ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/html/HTMLTagNames.in "")
    2006 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSHTMLElementWrapperFactory.cpp)
     2009list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/HTMLNames.cpp ${WebCore_DERIVED_SOURCES_DIR}/HTMLElementFactory.cpp ${WebCore_DERIVED_SOURCES_DIR}/JSHTMLElementWrapperFactory.cpp)
    20072010
    20082011
    20092012GENERATE_EVENT_FACTORY(${WEBCORE_DIR}/dom/EventNames.in Event)
    2010 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/EventInterfaces.h)
    2011 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/EventFactory.cpp)
     2013list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/EventInterfaces.h)
     2014list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/EventFactory.cpp)
    20122015
    20132016
    20142017GENERATE_EVENT_FACTORY(${WEBCORE_DIR}/dom/EventTargetFactory.in EventTarget)
    2015 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/EventTargetInterfaces.h)
    2016 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/EventTargetFactory.cpp)
     2018list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/EventTargetInterfaces.h)
     2019list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/EventTargetFactory.cpp)
    20172020
    20182021
    20192022GENERATE_SETTINGS_MACROS(${WEBCORE_DIR}/page/Settings.yaml Settings.h)
    2020 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/Settings.h)
    2021 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/Settings.cpp)
    2022 list(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.cpp)
     2023list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/Settings.h)
     2024list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/Settings.cpp)
     2025list(APPEND WebCoreTestSupport_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.cpp)
    20232026
    20242027
    20252028GENERATE_FONT_NAMES(${WEBCORE_DIR}/css/WebKitFontFamilyNames.in)
    2026 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitFontFamilyNames.cpp)
     2029list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.cpp)
    20272030
    20282031
    20292032GENERATE_DOM_NAMES(MathML ${WEBCORE_DIR}/mathml/mathattrs.in ${WEBCORE_DIR}/mathml/mathtags.in "")
    2030 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLNames.cpp)
     2033list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/MathMLNames.cpp)
    20312034if (ENABLE_MATHML)
    2032     list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLElementFactory.cpp)
     2035    list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/MathMLElementFactory.cpp)
    20332036endif ()
    20342037
    … …  
    20402043
    20412044GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in "${SVG_EXTRA_DEFINES}")
    2042 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGNames.cpp)
    2043 
    2044 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSSVGElementWrapperFactory.cpp)
     2045list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/SVGNames.cpp)
     2046
     2047list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/SVGElementFactory.cpp ${WebCore_DERIVED_SOURCES_DIR}/JSSVGElementWrapperFactory.cpp)
    20452048
    20462049GENERATE_DOM_NAMES(XLink ${WEBCORE_DIR}/svg/xlinkattrs.in)
    2047 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XLinkNames.cpp)
     2050list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XLinkNames.cpp)
    20482051
    20492052
    20502053GENERATE_DOM_NAMES(XMLNS ${WEBCORE_DIR}/xml/xmlnsattrs.in)
    2051 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNSNames.cpp)
     2054list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLNSNames.cpp)
    20522055
    20532056
    20542057GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
    2055 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
     2058list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLNames.cpp)
    20562059
    20572060WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES})

  • trunk/Source/WebCore/ChangeLog

    r244288 r244292  
     12019-04-15  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] WebCore derived sources should only be referenced inside WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=196904
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use WebCore_DERIVED_SOURCES_DIR instead of DERIVED_SOURCES_WEBCORE_DIR.
     9
     10        * CMakeLists.txt:
     11        * PlatformGTK.cmake:
     12        * PlatformWin.cmake:
     13        * WebCoreMacros.cmake:
     14
    1152019-04-15  John Wilander  <wilander@apple.com>
    216

  • trunk/Source/WebCore/PAL/ChangeLog

    r244220 r244292  
     12019-04-15  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] WebCore derived sources should only be referenced inside WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=196904
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Specify PAL_DERIVED_SOURCES_DIR as a private include directory.
     9
     10        * pal/CMakeLists.txt:
     11        * pal/PlatformWin.cmake:
     12
    1132019-04-12  Wenson Hsieh  <wenson_hsieh@apple.com>
    214

  • trunk/Source/WebCore/PAL/pal/CMakeLists.txt

    r244065 r244292  
    2929
    3030set(PAL_PRIVATE_INCLUDE_DIRECTORIES
     31    "${CMAKE_BINARY_DIR}"
     32    "${PAL_DERIVED_SOURCES_DIR}"
    3133    "${PAL_DIR}"
    3234    "${PAL_DIR}/pal"

  • trunk/Source/WebCore/PAL/pal/PlatformWin.cmake

    r235587 r244292  
    1010
    1111list(APPEND PAL_INCLUDE_DIRECTORIES
    12     "${CMAKE_BINARY_DIR}"
    1312    "${CMAKE_BINARY_DIR}/../include/private"
    1413)

  • trunk/Source/WebCore/PlatformGTK.cmake

    r243409 r244292  
    177177target_include_directories(WebCorePlatformGTK PRIVATE
    178178    ${WebCore_INCLUDE_DIRECTORIES}
     179    ${WebCore_PRIVATE_INCLUDE_DIRECTORIES}
    179180)
    180181target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE

  • trunk/Source/WebCore/PlatformWin.cmake

    r244065 r244292  
    22
    33list(APPEND WebCore_INCLUDE_DIRECTORIES
    4     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    54    "${CMAKE_BINARY_DIR}/../include/private"
    65    "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
    … …  
    1413    "${WEBCORE_DIR}/platform/network/win"
    1514    "${WEBCORE_DIR}/platform/win"
     15)
     16
     17# FIXME: ANGLE should put its headers into a single directory
     18list(APPEND WebCore_INCLUDE_DIRECTORIES
     19    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    1620    "${THIRDPARTY_DIR}/ANGLE/include"
    1721    "${THIRDPARTY_DIR}/ANGLE/include/egl"
    … …  
    281285
    282286if (CMAKE_SIZEOF_VOID_P EQUAL 4)
    283     list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj)
     287    list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj)
    284288    add_custom_command(
    285         OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj
     289        OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj
    286290        DEPENDS ${WEBCORE_DIR}/platform/win/makesafeseh.asm
    287         COMMAND ml /safeseh /c /Fo ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj ${WEBCORE_DIR}/platform/win/makesafeseh.asm
     291        COMMAND ml /safeseh /c /Fo ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj ${WEBCORE_DIR}/platform/win/makesafeseh.asm
    288292        VERBATIM)
    289293endif ()
    … …  
    322326
    323327set(WebCore_PRIVATE_FRAMEWORK_HEADERS
    324     ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.h
    325     ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.h
    326     ${DERIVED_SOURCES_WEBCORE_DIR}/EventInterfaces.h
    327     ${DERIVED_SOURCES_WEBCORE_DIR}/EventTargetInterfaces.h
    328     ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLElementTypeHelpers.h
    329     ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLNames.h
    330     ${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.h
    331     ${DERIVED_SOURCES_WEBCORE_DIR}/JSBlob.h
    332     ${DERIVED_SOURCES_WEBCORE_DIR}/JSCSSStyleDeclaration.h
    333     ${DERIVED_SOURCES_WEBCORE_DIR}/JSDOMBindingInternalsBuiltins.h
    334     ${DERIVED_SOURCES_WEBCORE_DIR}/JSDOMWindow.h
    335     ${DERIVED_SOURCES_WEBCORE_DIR}/JSDocument.h
    336     ${DERIVED_SOURCES_WEBCORE_DIR}/JSElement.h
    337     ${DERIVED_SOURCES_WEBCORE_DIR}/JSEventTarget.h
    338     ${DERIVED_SOURCES_WEBCORE_DIR}/JSFile.h
    339     ${DERIVED_SOURCES_WEBCORE_DIR}/JSHTMLElement.h
    340     ${DERIVED_SOURCES_WEBCORE_DIR}/JSNode.h
    341     ${DERIVED_SOURCES_WEBCORE_DIR}/JSNotification.h
    342     ${DERIVED_SOURCES_WEBCORE_DIR}/JSRange.h
    343     ${DERIVED_SOURCES_WEBCORE_DIR}/JSReadableStream.h
    344     ${DERIVED_SOURCES_WEBCORE_DIR}/JSReadableStreamDefaultController.h
    345     ${DERIVED_SOURCES_WEBCORE_DIR}/RTCPeerConnectionInternalsBuiltins.h
    346     ${DERIVED_SOURCES_WEBCORE_DIR}/ReadableByteStreamInternalsBuiltins.h
    347     ${DERIVED_SOURCES_WEBCORE_DIR}/ReadableStreamInternalsBuiltins.h
    348     ${DERIVED_SOURCES_WEBCORE_DIR}/Settings.h
    349     ${DERIVED_SOURCES_WEBCORE_DIR}/StreamInternalsBuiltins.h
    350     ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h
    351     ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h
    352     ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitFontFamilyNames.h
    353     ${DERIVED_SOURCES_WEBCORE_DIR}/WritableStreamInternalsBuiltins.h
     328    ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.h
     329    ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.h
     330    ${WebCore_DERIVED_SOURCES_DIR}/EventInterfaces.h
     331    ${WebCore_DERIVED_SOURCES_DIR}/EventTargetInterfaces.h
     332    ${WebCore_DERIVED_SOURCES_DIR}/HTMLElementTypeHelpers.h
     333    ${WebCore_DERIVED_SOURCES_DIR}/HTMLNames.h
     334    ${WebCore_DERIVED_SOURCES_DIR}/HTTPHeaderNames.h
     335    ${WebCore_DERIVED_SOURCES_DIR}/JSBlob.h
     336    ${WebCore_DERIVED_SOURCES_DIR}/JSCSSStyleDeclaration.h
     337    ${WebCore_DERIVED_SOURCES_DIR}/JSDOMBindingInternalsBuiltins.h
     338    ${WebCore_DERIVED_SOURCES_DIR}/JSDOMWindow.h
     339    ${WebCore_DERIVED_SOURCES_DIR}/JSDocument.h
     340    ${WebCore_DERIVED_SOURCES_DIR}/JSElement.h
     341    ${WebCore_DERIVED_SOURCES_DIR}/JSEventTarget.h
     342    ${WebCore_DERIVED_SOURCES_DIR}/JSFile.h
     343    ${WebCore_DERIVED_SOURCES_DIR}/JSHTMLElement.h
     344    ${WebCore_DERIVED_SOURCES_DIR}/JSNode.h
     345    ${WebCore_DERIVED_SOURCES_DIR}/JSNotification.h
     346    ${WebCore_DERIVED_SOURCES_DIR}/JSRange.h
     347    ${WebCore_DERIVED_SOURCES_DIR}/JSReadableStream.h
     348    ${WebCore_DERIVED_SOURCES_DIR}/JSReadableStreamDefaultController.h
     349    ${WebCore_DERIVED_SOURCES_DIR}/RTCPeerConnectionInternalsBuiltins.h
     350    ${WebCore_DERIVED_SOURCES_DIR}/ReadableByteStreamInternalsBuiltins.h
     351    ${WebCore_DERIVED_SOURCES_DIR}/ReadableStreamInternalsBuiltins.h
     352    ${WebCore_DERIVED_SOURCES_DIR}/Settings.h
     353    ${WebCore_DERIVED_SOURCES_DIR}/StreamInternalsBuiltins.h
     354    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h
     355    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.h
     356    ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.h
     357    ${WebCore_DERIVED_SOURCES_DIR}/WritableStreamInternalsBuiltins.h
    354358)
    355359

  • trunk/Source/WebCore/WebCoreMacros.cmake

    r243746 r244292  
    33
    44    if (${_source} STREQUAL "DocTypeStrings")
    5         set(_hash_tools_h "${DERIVED_SOURCES_WEBCORE_DIR}/HashTools.h")
     5        set(_hash_tools_h "${WebCore_DERIVED_SOURCES_DIR}/HashTools.h")
    66    else ()
    77        set(_hash_tools_h "")
    … …  
    99
    1010    add_custom_command(
    11         OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_name}.cpp ${_hash_tools_h}
     11        OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/${_name}.cpp ${_hash_tools_h}
    1212        MAIN_DEPENDENCY ${_source}.gperf
    13         COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_WEBCORE_DIR} ${_source}.gperf ${GPERF_EXECUTABLE}
     13        COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${WebCore_DERIVED_SOURCES_DIR} ${_source}.gperf ${GPERF_EXECUTABLE}
    1414        VERBATIM)
    1515
    … …  
    2020
    2121# Append the given dependencies to the source file
    22 # This one consider the given dependencies are in ${DERIVED_SOURCES_WEBCORE_DIR}
     22# This one consider the given dependencies are in ${WebCore_DERIVED_SOURCES_DIR}
    2323# and prepends this to every member of dependencies list
    2424macro(ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES _source _deps)
    2525    set(_tmp "")
    2626    foreach (f ${_deps})
    27         list(APPEND _tmp "${DERIVED_SOURCES_WEBCORE_DIR}/${f}")
     27        list(APPEND _tmp "${WebCore_DERIVED_SOURCES_DIR}/${f}")
    2828    endforeach ()
    2929
    … …  
    149149    set(NAMES_GENERATOR ${WEBCORE_DIR}/dom/make_names.pl)
    150150    set(_arguments  --fonts ${_infile})
    151     set(_outputfiles ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitFontFamilyNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitFontFamilyNames.h)
     151    set(_outputfiles ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.cpp ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.h)
    152152
    153153    add_custom_command(
    … …  
    155155        MAIN_DEPENDENCY ${_infile}
    156156        DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
    157         COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments}
     157        COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --outputDir ${WebCore_DERIVED_SOURCES_DIR} ${_arguments}
    158158        VERBATIM)
    159159endmacro()
    … …  
    162162macro(GENERATE_EVENT_FACTORY _infile _namespace)
    163163    set(NAMES_GENERATOR ${WEBCORE_DIR}/dom/make_event_factory.pl)
    164     set(_outputfiles ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}Interfaces.h ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}Factory.cpp)
     164    set(_outputfiles ${WebCore_DERIVED_SOURCES_DIR}/${_namespace}Interfaces.h ${WebCore_DERIVED_SOURCES_DIR}/${_namespace}Factory.cpp)
    165165
    166166    add_custom_command(
    … …  
    168168        MAIN_DEPENDENCY ${_infile}
    169169        DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
    170         COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --input ${_infile} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
     170        COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --input ${_infile} --outputDir ${WebCore_DERIVED_SOURCES_DIR}
    171171        VERBATIM)
    172172endmacro()
    … …  
    180180    # <https://cmake.org/cmake/help/v3.0/command/add_custom_command.html>
    181181    set(_extra_output
    182         ${DERIVED_SOURCES_WEBCORE_DIR}/Settings.cpp
    183         ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.h
    184         ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.cpp
    185         ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl
     182        ${WebCore_DERIVED_SOURCES_DIR}/Settings.cpp
     183        ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.h
     184        ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.cpp
     185        ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.idl
    186186    )
    187187
    … …  
    196196    set(_args BYPRODUCTS ${_extra_output})
    197197    add_custom_command(
    198         OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_outfile}
     198        OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/${_outfile}
    199199        MAIN_DEPENDENCY ${_infile}
    200200        DEPENDS ${NAMES_GENERATOR} ${GENERATE_SETTINGS_SCRIPTS} ${SCRIPTS_BINDINGS}
    201         COMMAND ${RUBY_EXECUTABLE} ${NAMES_GENERATOR} --input ${_infile} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
     201        COMMAND ${RUBY_EXECUTABLE} ${NAMES_GENERATOR} --input ${_infile} --outputDir ${WebCore_DERIVED_SOURCES_DIR}
    202202        VERBATIM ${_args})
    203203endmacro()
    … …  
    207207    set(NAMES_GENERATOR ${WEBCORE_DIR}/dom/make_names.pl)
    208208    set(_arguments  --attrs ${_attrs})
    209     set(_outputfiles ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}Names.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}Names.h)
     209    set(_outputfiles ${WebCore_DERIVED_SOURCES_DIR}/${_namespace}Names.cpp ${WebCore_DERIVED_SOURCES_DIR}/${_namespace}Names.h)
    210210    set(_extradef)
    211211    set(_tags)
    … …  
    221221    if (_tags)
    222222        set(_arguments "${_arguments}" --tags ${_tags} --factory --wrapperFactory)
    223         set(_outputfiles "${_outputfiles}" ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.h ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementTypeHelpers.h ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.h)
     223        set(_outputfiles "${_outputfiles}" ${WebCore_DERIVED_SOURCES_DIR}/${_namespace}ElementFactory.cpp ${WebCore_DERIVED_SOURCES_DIR}/${_namespace}ElementFactory.h ${WebCore_DERIVED_SOURCES_DIR}/${_namespace}ElementTypeHelpers.h ${WebCore_DERIVED_SOURCES_DIR}/JS${_namespace}ElementWrapperFactory.cpp ${WebCore_DERIVED_SOURCES_DIR}/JS${_namespace}ElementWrapperFactory.h)
    224224    endif ()
    225225
    … …  
    231231        OUTPUT  ${_outputfiles}
    232232        DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
    233         COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
    234         VERBATIM)
    235 endmacro()
     233        COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${WebCore_DERIVED_SOURCES_DIR} ${_arguments} ${_additionArguments}
     234        VERBATIM)
     235endmacro()

  • trunk/Source/WebKit/ChangeLog

    r244291 r244292  
     12019-04-15  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] WebCore derived sources should only be referenced inside WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=196904
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Remove reference to DERIVED_SOURCES_WEBCORE_DIR in PlatformMac.cmake.
     9
     10        * PlatformMac.cmake:
     11
    1122019-04-15  Zalan Bujtas  <zalan@apple.com>
    213

  • trunk/Source/WebKit/PlatformMac.cmake

    r241224 r244292  
    424424    "${WEBKIT_DIR}/WebProcess/WebCoreSupport/mac"
    425425    "${FORWARDING_HEADERS_DIR}/WebCore"
    426     "${DERIVED_SOURCES_WEBCORE_DIR}"
    427426)
    428427

  • trunk/Source/cmake/OptionsWinCairo.cmake

    r244245 r244292  
    5252set(WTF_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WTF/DerivedSources)
    5353set(JavaScriptCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/DerivedSources)
     54set(WebCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebCore/DerivedSources)
    5455
    5556# Override scripts directories
Note: See TracChangeset for help on using the changeset viewer.