Changeset 188540 in webkit


Ignore:
Timestamp:
Aug 17, 2015 1:37:06 PM (9 years ago)
Author:
achristensen@apple.com
Message:

Move some commands from ./CMakeLists.txt to Source/cmake
​https://bugs.webkit.org/show_bug.cgi?id=148003

Reviewed by Brent Fulgham.

  • CMakeLists.txt:

.:

Moved functionality to WebKitCommon.cmake and WebKitFS.cmake and made conditional
so we can change directory structure from command line parameters.

  • Source/cmake/OptionsAppleWin.cmake:
  • Source/cmake/OptionsWin.cmake: Copied from Source/cmake/OptionsWindows.cmake.
  • Source/cmake/OptionsWinCairo.cmake:
  • Source/cmake/OptionsWindows.cmake: Removed.
  • Source/cmake/WebKitCommon.cmake: Added.
  • Source/cmake/WebKitFS.cmake:

Source/JavaScriptCore:

Added commands needed to build JSC by itself.

Source/WebCore:

Added commands needed to build WebCore by itself.

Source/WebKit:

Added some commands needed to build WebKit by itself.

Source/WTF:

Added commands needed to build WTF by itself.

Location:
trunk
Files:
1 added
13 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r188436 r188540  
    11cmake_minimum_required(VERSION 2.8.12)
    22project(WebKit)
    3 
    4 # -----------------------------------------------------------------------------
    5 # Default library type
    6 # -----------------------------------------------------------------------------
    7 set(BMALLOC_DIR "${CMAKE_SOURCE_DIR}/Source/bmalloc")
    8 set(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
    9 set(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
    10 set(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
    11 set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
    12 set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit2")
    13 set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/Source/ThirdParty")
    14 
    15 set(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
    16 
    17 set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
    18 set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
    19 set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
    20 set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
    21 set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
    22 set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
    23 set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
    24 set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
    253
    264set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")

  • trunk/ChangeLog

    r188436 r188540  
     12015-08-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move some commands from ./CMakeLists.txt to Source/cmake
     4        https://bugs.webkit.org/show_bug.cgi?id=148003
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Moved functionality to WebKitCommon.cmake and WebKitFS.cmake and made conditional
     10        so we can change directory structure from command line parameters.
     11        * Source/cmake/OptionsAppleWin.cmake:
     12        * Source/cmake/OptionsWin.cmake: Copied from Source/cmake/OptionsWindows.cmake.
     13        * Source/cmake/OptionsWinCairo.cmake:
     14        * Source/cmake/OptionsWindows.cmake: Removed.
     15        * Source/cmake/WebKitCommon.cmake: Added.
     16        * Source/cmake/WebKitFS.cmake:
     17
    1182015-08-13  Commit Queue  <commit-queue@webkit.org>
    219

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r188497 r188540  
     1cmake_minimum_required(VERSION 2.8.12)
     2include(WebKitCommon)
     3
    14set(JavaScriptCore_INCLUDE_DIRECTORIES
    25    "${CMAKE_BINARY_DIR}"

  • trunk/Source/JavaScriptCore/ChangeLog

    r188532 r188540  
     12015-08-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move some commands from ./CMakeLists.txt to Source/cmake
     4        https://bugs.webkit.org/show_bug.cgi?id=148003
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Added commands needed to build JSC by itself.
     10
    1112015-08-17  Yusuke Suzuki  <utatane.tea@gmail.com>
    212

  • trunk/Source/WTF/CMakeLists.txt

    r188436 r188540  
     1cmake_minimum_required(VERSION 2.8.12)
     2include(WebKitCommon)
     3
    14add_subdirectory(wtf)

  • trunk/Source/WTF/ChangeLog

    r188499 r188540  
     12015-08-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move some commands from ./CMakeLists.txt to Source/cmake
     4        https://bugs.webkit.org/show_bug.cgi?id=148003
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Added commands needed to build WTF by itself.
     10
    1112015-08-14  Filip Pizlo  <fpizlo@apple.com>
    212

  • trunk/Source/WebCore/CMakeLists.txt

    r188520 r188540  
     1cmake_minimum_required(VERSION 2.8.12)
     2include(WebKitCommon)
     3
    14set(WebCore_INCLUDE_DIRECTORIES
    25    "${WEBCORE_DIR}"

  • trunk/Source/WebCore/ChangeLog

    r188536 r188540  
     12015-08-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move some commands from ./CMakeLists.txt to Source/cmake
     4        https://bugs.webkit.org/show_bug.cgi?id=148003
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Added commands needed to build WebCore by itself.
     10
    1112015-08-17  Alex Christensen  <achristensen@webkit.org>
    212

  • trunk/Source/WebKit/CMakeLists.txt

    r188436 r188540  
     1cmake_minimum_required(VERSION 2.8.12)
     2include(WebKitCommon)
     3
    14set(WebKit_SOURCES
    25)

  • trunk/Source/WebKit/ChangeLog

    r188436 r188540  
     12015-08-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move some commands from ./CMakeLists.txt to Source/cmake
     4        https://bugs.webkit.org/show_bug.cgi?id=148003
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Added some commands needed to build WebKit by itself.
     10
    1112015-08-13  Commit Queue  <commit-queue@webkit.org>
    212

  • trunk/Source/cmake/OptionsAppleWin.cmake

    r183697 r188540  
    1 include(OptionsWindows)
     1include(OptionsWin)
    22
    33set(USE_CG 1)

  • trunk/Source/cmake/OptionsWinCairo.cmake

    r188101 r188540  
    11set(WTF_PLATFORM_WIN_CAIRO 1)
    22
    3 include(OptionsWindows)
     3include(OptionsWin)
    44
    55set(USE_CF 1)

  • trunk/Source/cmake/WebKitFS.cmake

    r188436 r188540  
     1if (NOT BMALLOC_DIR)
     2    set(BMALLOC_DIR "${CMAKE_SOURCE_DIR}/Source/bmalloc")
     3endif ()
     4if (NOT WTF_DIR)
     5    set(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
     6endif ()
     7if (NOT JAVASCRIPTCORE_DIR)
     8    set(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
     9endif ()
     10if (NOT WEBCORE_DIR)
     11    set(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
     12endif ()
     13if (NOT WEBKIT_DIR)
     14    set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
     15endif ()
     16if (NOT WEBKIT2_DIR)
     17    set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit2")
     18endif ()
     19if (NOT THIRDPARTY_DIR)
     20    set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/Source/ThirdParty")
     21endif ()
     22if (NOT TOOLS_DIR)
     23    set(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
     24endif ()
     25
     26set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
     27set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
     28set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
     29set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
     30set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
     31set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
     32set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
     33set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
     34
    135file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
    236file(MAKE_DIRECTORY ${DERIVED_SOURCES_WTF_DIR})
Note: See TracChangeset for help on using the changeset viewer.