Changeset 111799 in webkit


Ignore:
Timestamp:
Mar 22, 2012 5:54:09 PM (12 years ago)
Author:
kubo@profusion.mobi
Message:

[CMake] Unreviewed build fix after r111778.

.:

  • Source/CMakeLists.txt: Build WTF/.

Source/JavaScriptCore:

  • CMakeLists.txt: Move ${WTF_DIR} after ${JAVASCRIPTCORE_DIR} in

the include paths so that the right config.h is used.

Source/WebCore:

  • CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with

${WTF_DIR}/wtf ones.

Source/WebKit:

  • CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with

${WTF_DIR}/wtf ones.

Source/WebKit2:

  • CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with

${WTF_DIR}/wtf ones.

Source/WTF:

  • CMakeLists.txt: Added.
  • wtf/CMakeLists.txt: Add ${CMAKE_BINARY_DIR} to the include paths

for cmakeconfig.h to be found.

Tools:

  • DumpRenderTree/efl/CMakeLists.txt: Replace

${JAVASCRIPTCORE_DIR}/wtf with ${WTF_DIR}/wtf in the include
paths.

  • DumpRenderTree/efl/LayoutTestControllerEfl.cpp: Use the right

wtf include.

  • DumpRenderTree/efl/WorkQueueItemEfl.cpp: Ditto.
  • WinCELauncher/CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf

with ${WTF_DIR}/wtf in the include paths.

Location:
trunk
Files:
1 added
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r111787 r111799  
     12012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
     2
     3        [CMake] Unreviewed build fix after r111778.
     4
     5        * Source/CMakeLists.txt: Build WTF/.
     6
    172012-03-22  Martin Robinson  <mrobinson@igalia.com>
    28

  • trunk/Source/CMakeLists.txt

    r103417 r111799  
    22# Add module directories
    33# -----------------------------------------------------------------------------
     4ADD_SUBDIRECTORY(WTF)
     5
    46ADD_SUBDIRECTORY(JavaScriptCore)
    57

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r111504 r111799  
    11SET(JavaScriptCore_INCLUDE_DIRECTORIES
    22    "${CMAKE_BINARY_DIR}"
    3     "${WTF_DIR}"
    43    "${JAVASCRIPTCORE_DIR}"
    54    "${JAVASCRIPTCORE_DIR}/API"
    … …  
    1918    "${JAVASCRIPTCORE_DIR}/tools"
    2019    "${JAVASCRIPTCORE_DIR}/yarr"
    21     "${JAVASCRIPTCORE_DIR}/wtf"
     20    "${WTF_DIR}"
    2221    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    2322    "${CMAKE_SOURCE_DIR}/Source"
    … …  
    296295
    297296
    298 ADD_SUBDIRECTORY(wtf)
    299297ADD_SUBDIRECTORY(shell)
    300298

  • trunk/Source/JavaScriptCore/ChangeLog

    r111791 r111799  
     12012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
     2
     3        [CMake] Unreviewed build fix after r111778.
     4
     5        * CMakeLists.txt: Move ${WTF_DIR} after ${JAVASCRIPTCORE_DIR} in
     6        the include paths so that the right config.h is used.
     7
    182012-03-22  Tony Chang  <tony@chromium.org>
    29

  • trunk/Source/WTF/ChangeLog

    r111794 r111799  
     12012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
     2
     3        [CMake] Unreviewed build fix after r111778.
     4
     5        * CMakeLists.txt: Added.
     6        * wtf/CMakeLists.txt: Add ${CMAKE_BINARY_DIR} to the include paths
     7        for cmakeconfig.h to be found.
     8
    192012-03-22  Tony Chang  <tony@chromium.org>
    210

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r111778 r111799  
    191191    "${WTF_DIR}/wtf/dtoa"
    192192    "${THIRDPARTY_DIR}"
     193    "${CMAKE_BINARY_DIR}"
    193194)
    194195

  • trunk/Source/WebCore/CMakeLists.txt

    r111733 r111799  
    11SET(WebCore_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}"
    3     "${WTF_DIR}"
    43    "${WEBCORE_DIR}/Modules/filesystem"
    54    "${WEBCORE_DIR}/Modules/geolocation"
    … …  
    8685    "${JAVASCRIPTCORE_DIR}/profiler"
    8786    "${JAVASCRIPTCORE_DIR}/runtime"
    88     "${JAVASCRIPTCORE_DIR}/wtf"
    89     "${JAVASCRIPTCORE_DIR}/wtf/unicode"
    9087    "${JAVASCRIPTCORE_DIR}/yarr"
     88    "${WTF_DIR}"
     89    "${WTF_DIR}/wtf"
     90    "${WTF_DIR}/wtf/unicode"
    9191    "${DERIVED_SOURCES_WEBCORE_DIR}"
    9292    "${CMAKE_SOURCE_DIR}/Source"

  • trunk/Source/WebCore/ChangeLog

    r111791 r111799  
     12012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
     2
     3        [CMake] Unreviewed build fix after r111778.
     4
     5        * CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with
     6        ${WTF_DIR}/wtf ones.
     7
    182012-03-22  Tony Chang  <tony@chromium.org>
    29

  • trunk/Source/WebKit/CMakeLists.txt

    r111504 r111799  
    11SET(WebKit_INCLUDE_DIRECTORIES
    2     "${WTF_DIR}"
    32    "${WEBKIT_DIR}"
    43    "${WEBCORE_DIR}"
    … …  
    5251    "${JAVASCRIPTCORE_DIR}/profiler"
    5352    "${JAVASCRIPTCORE_DIR}/runtime"
    54     "${JAVASCRIPTCORE_DIR}/wtf"
    55     "${JAVASCRIPTCORE_DIR}/wtf/unicode"
     53    "${WTF_DIR}"
     54    "${WTF_DIR}/wtf"
     55    "${WTF_DIR}/wtf/unicode"
    5656    "${DERIVED_SOURCES_WEBCORE_DIR}"
    5757    "${CMAKE_BINARY_DIR}"

  • trunk/Source/WebKit/ChangeLog

    r111673 r111799  
     12012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
     2
     3        [CMake] Unreviewed build fix after r111778.
     4
     5        * CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with
     6        ${WTF_DIR}/wtf ones.
     7
    182012-03-22  Hyowon Kim  <hw1008.kim@samsung.com>
    29

  • trunk/Source/WebKit2/CMakeLists.txt

    r110397 r111799  
    8686    "${JAVASCRIPTCORE_DIR}/profiler"
    8787    "${JAVASCRIPTCORE_DIR}/runtime"
    88     "${JAVASCRIPTCORE_DIR}/wtf"
     88    "${WTF_DIR}/wtf"
    8989    "${DERIVED_SOURCES_DIR}"
    9090    "${DERIVED_SOURCES_WEBCORE_DIR}"

  • trunk/Source/WebKit2/ChangeLog

    r111783 r111799  
     12012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
     2
     3        [CMake] Unreviewed build fix after r111778.
     4
     5        * CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with
     6        ${WTF_DIR}/wtf ones.
     7
    182012-03-22  Csaba Osztrogonác  <ossy@webkit.org>
    29

  • trunk/Tools/ChangeLog

    r111797 r111799  
     12012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
     2
     3        [CMake] Unreviewed build fix after r111778.
     4
     5        * DumpRenderTree/efl/CMakeLists.txt: Replace
     6        ${JAVASCRIPTCORE_DIR}/wtf with ${WTF_DIR}/wtf in the include
     7        paths.
     8        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp: Use the right
     9        wtf include.
     10        * DumpRenderTree/efl/WorkQueueItemEfl.cpp: Ditto.
     11        * WinCELauncher/CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf
     12        with ${WTF_DIR}/wtf in the include paths.
     13
    1142012-03-22  Filip Pizlo  <fpizlo@apple.com>
    215

  • trunk/Tools/DumpRenderTree/efl/CMakeLists.txt

    r111678 r111799  
    4242
    4343SET(DumpRenderTree_INCLUDE_DIRECTORIES
    44     ${WTF_DIR}
    4544    "${WEBKIT_DIR}/efl/ewk"
    4645    ${WEBKIT_DIR}/efl
    … …  
    8180    ${JAVASCRIPTCORE_DIR}/runtime
    8281    ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
    83     ${JAVASCRIPTCORE_DIR}/wtf
    84     ${JAVASCRIPTCORE_DIR}/wtf/gobject
    85     ${JAVASCRIPTCORE_DIR}/wtf/efl
    8682    ${TOOLS_DIR}/DumpRenderTree
    8783    ${TOOLS_DIR}/DumpRenderTree/cairo
    8884    ${TOOLS_DIR}/DumpRenderTree/efl
     85    ${WTF_DIR}
     86    ${WTF_DIR}/wtf
     87    ${WTF_DIR}/wtf/efl
     88    ${WTF_DIR}/wtf/gobject
    8989    ${CMAKE_SOURCE_DIR}/Source
    9090    ${CMAKE_BINARY_DIR}

  • trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp

    r111756 r111799  
    5050#include <JavaScriptCore/JSStringRef.h>
    5151#include <JavaScriptCore/OpaqueJSString.h>
    52 #include <JavaScriptCore/wtf/text/WTFString.h>
    5352#include <KURL.h>
    5453#include <editing/FindOptions.h>
    5554#include <stdio.h>
     55#include <wtf/text/WTFString.h>
    5656
    5757LayoutTestController::~LayoutTestController()

  • trunk/Tools/DumpRenderTree/efl/WorkQueueItemEfl.cpp

    r96943 r111799  
    3030#include <JavaScriptCore/OpaqueJSString.h>
    3131#include <JavaScriptCore/runtime/UString.h>
    32 #include <JavaScriptCore/wtf/text/CString.h>
     32#include <wtf/text/CString.h>
    3333
    3434bool LoadItem::invoke() const

  • trunk/Tools/WinCELauncher/CMakeLists.txt

    r101052 r111799  
    77    "${WEBCORE_DIR}/platform/text"
    88    "${JAVASCRIPTCORE_DIR}"
    9     "${JAVASCRIPTCORE_DIR}/wtf"
     9    "${WTF_DIR}/wtf"
    1010    "${DERIVED_SOURCES_DIR}"
    1111    "${CMAKE_BINARY_DIR}"
Note: See TracChangeset for help on using the changeset viewer.