⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 220091 in webkit


Ignore:
Timestamp:
Aug 1, 2017, 1:08:56 AM (9 years ago)
Author:
Michael Catanzaro
Message:

[CMake] WebKitFS.cmake depends on options set in Option cmake files that are included later
​https://bugs.webkit.org/show_bug.cgi?id=174855

Reviewed by Carlos Garcia Campos.

.:

Create derived sources directories in WebKitCommon.cmake instead of WebKitFS.cmake, which is
too soon. I tried changing the include order, but other stuff in WebKitFS.cmake really is
needed before including the port options file.

  • Source/cmake/WebKitCommon.cmake:
  • Source/cmake/WebKitFS.cmake:

Source/WebDriver:

Don't create derived sources directory here anymore.

  • PlatformGTK.cmake:

Source/WebKit:

Don't create derived sources directory here anymore.

  • PlatformGTK.cmake:
  • PlatformMac.cmake:
  • PlatformWPE.cmake:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r220046 r220091  
     12017-08-01  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [CMake] WebKitFS.cmake depends on options set in Option cmake files that are included later
     4        https://bugs.webkit.org/show_bug.cgi?id=174855
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Create derived sources directories in WebKitCommon.cmake instead of WebKitFS.cmake, which is
     9        too soon. I tried changing the include order, but other stuff in WebKitFS.cmake really is
     10        needed before including the port options file.
     11
     12        * Source/cmake/WebKitCommon.cmake:
     13        * Source/cmake/WebKitFS.cmake:
     14
    1152017-07-29  Yusuke Suzuki  <utatane.tea@gmail.com>
    216

  • trunk/Source/WebDriver/ChangeLog

    r219907 r220091  
     12017-08-01  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [CMake] WebKitFS.cmake depends on options set in Option cmake files that are included later
     4        https://bugs.webkit.org/show_bug.cgi?id=174855
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Don't create derived sources directory here anymore.
     9
     10        * PlatformGTK.cmake:
     11
    1122017-07-26  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • trunk/Source/WebDriver/PlatformGTK.cmake

    r219907 r220091  
    1 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
    2 
    31set(WebDriver_Process_OUTPUT_NAME WebKitWebDriver)
    42

  • trunk/Source/WebKit/ChangeLog

    r220074 r220091  
     12017-08-01  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [CMake] WebKitFS.cmake depends on options set in Option cmake files that are included later
     4        https://bugs.webkit.org/show_bug.cgi?id=174855
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Don't create derived sources directory here anymore.
     9
     10        * PlatformGTK.cmake:
     11        * PlatformMac.cmake:
     12        * PlatformWPE.cmake:
     13
    1142017-07-31  Daniel Bates  <dabates@apple.com>
    215

  • trunk/Source/WebKit/PlatformGTK.cmake

    r220046 r220091  
    55set(WebKit2_StorageProcess_OUTPUT_NAME WebKitDatabaseProcess)
    66
    7 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
    87file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR})
    98file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_DIR})

  • trunk/Source/WebKit/PlatformMac.cmake

    r220046 r220091  
    383383    WebProcess/mac/SecItemShimLibrary.mm
    384384)
    385 
    386 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
    387385
    388386list(APPEND WebKit2_INCLUDE_DIRECTORIES

  • trunk/Source/WebKit/PlatformWPE.cmake

    r220046 r220091  
    1 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
    21file(MAKE_DIRECTORY ${DERIVED_SOURCES_WPE_API_DIR})
    32file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DIR})

  • trunk/Source/cmake/WebKitCommon.cmake

    r219580 r220091  
    5858
    5959    # -----------------------------------------------------------------------------
     60    # Create derived sources directories
     61    # -----------------------------------------------------------------------------
     62
     63    if (ENABLE_WEBCORE)
     64        file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
     65    endif ()
     66
     67    if (ENABLE_WEBKIT)
     68        file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
     69    endif ()
     70
     71    if (ENABLE_WEBKIT_LEGACY)
     72        file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
     73        file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
     74    endif ()
     75
     76    if (ENABLE_WEBDRIVER)
     77        file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
     78    endif ()
     79
     80    # -----------------------------------------------------------------------------
    6081    # config.h
    6182    # -----------------------------------------------------------------------------
    62 
    6383    CREATE_CONFIGURATION_HEADER()
    6484endif ()

  • trunk/Source/cmake/WebKitFS.cmake

    r219911 r220091  
    4848file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/Protocol)
    4949file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
    50 
    51 if (ENABLE_WEBCORE)
    52     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
    53 endif ()
    54 
    55 if (ENABLE_WEBKIT)
    56     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
    57 endif ()
    58 
    59 if (ENABLE_WEBKIT_LEGACY)
    60     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
    61     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
    62 endif ()
    63 
    64 if (ENABLE_WEBDRIVER)
    65     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
    66 endif ()
Note: See TracChangeset for help on using the changeset viewer.