Changeset 148463 in webkit


Ignore:
Timestamp:
Apr 15, 2013 1:32:40 PM (11 years ago)
Author:
Patrick Gansterer
Message:

[CMake] Add WTF_USE_*_UNICODE variables
​https://bugs.webkit.org/show_bug.cgi?id=114556

Reviewed by Brent Fulgham.

WTF_USE_ICU_UNICODE and WTF_USE_WCHAR_UNICODE are used to
reduce duplication in the platform specific CMake files.

.:

  • Source/cmake/OptionsBlackBerry.cmake:
  • Source/cmake/OptionsEfl.cmake:
  • Source/cmake/OptionsWinCE.cmake:

Source/JavaScriptCore:

  • CMakeLists.txt:
  • PlatformEfl.cmake:

Source/WebCore:

  • CMakeLists.txt:
  • PlatformBlackBerry.cmake:
  • PlatformEfl.cmake:
  • PlatformWinCE.cmake:

Source/WTF:

  • wtf/CMakeLists.txt:
  • wtf/PlatformBlackBerry.cmake:
  • wtf/PlatformEfl.cmake:
  • wtf/PlatformWinCE.cmake:
Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r148445 r148463  
     12013-04-15  Patrick Gansterer  <paroga@webkit.org>
     2
     3        [CMake] Add WTF_USE_*_UNICODE variables
     4        https://bugs.webkit.org/show_bug.cgi?id=114556
     5
     6        Reviewed by Brent Fulgham.
     7
     8        WTF_USE_ICU_UNICODE and WTF_USE_WCHAR_UNICODE are used to
     9        reduce duplication in the platform specific CMake files.
     10
     11        * Source/cmake/OptionsBlackBerry.cmake:
     12        * Source/cmake/OptionsEfl.cmake:
     13        * Source/cmake/OptionsWinCE.cmake:
     14
    1152013-04-15  Martin Robinson  <mrobinson@igalia.com>
    216

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r148119 r148463  
    340340)
    341341
     342if (WTF_USE_ICU_UNICODE)
     343    list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
     344        ${ICU_INCLUDE_DIRS}
     345    )
     346    list(APPEND JavaScriptCore_LIBRARIES
     347        ${ICU_I18N_LIBRARIES}
     348    )
     349endif ()
     350
    342351if (ENABLE_LLINT)
    343352    # We cannot check for RUBY_FOUND because it is set only when the full package is installed and

  • trunk/Source/JavaScriptCore/ChangeLog

    r148356 r148463  
     12013-04-15  Patrick Gansterer  <paroga@webkit.org>
     2
     3        [CMake] Add WTF_USE_*_UNICODE variables
     4        https://bugs.webkit.org/show_bug.cgi?id=114556
     5
     6        Reviewed by Brent Fulgham.
     7
     8        WTF_USE_ICU_UNICODE and WTF_USE_WCHAR_UNICODE are used to
     9        reduce duplication in the platform specific CMake files.
     10
     11        * CMakeLists.txt:
     12        * PlatformEfl.cmake:
     13
    1142013-04-13  Patrick Gansterer  <paroga@webkit.org>
    215

  • trunk/Source/JavaScriptCore/PlatformEfl.cmake

    r136914 r148463  
    33)
    44
    5 list(APPEND JavaScriptCore_LIBRARIES
    6     ${ICU_I18N_LIBRARIES}
     5list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
     6    ${JAVASCRIPTCORE_DIR}/wtf/gobject
    77)
    88
    9 list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
    10     ${JAVASCRIPTCORE_DIR}/wtf/gobject
    11     ${ICU_INCLUDE_DIRS}
    12 )
    13 

  • trunk/Source/WTF/ChangeLog

    r148462 r148463  
     12013-04-15  Patrick Gansterer  <paroga@webkit.org>
     2
     3        [CMake] Add WTF_USE_*_UNICODE variables
     4        https://bugs.webkit.org/show_bug.cgi?id=114556
     5
     6        Reviewed by Brent Fulgham.
     7
     8        WTF_USE_ICU_UNICODE and WTF_USE_WCHAR_UNICODE are used to
     9        reduce duplication in the platform specific CMake files.
     10
     11        * wtf/CMakeLists.txt:
     12        * wtf/PlatformBlackBerry.cmake:
     13        * wtf/PlatformEfl.cmake:
     14        * wtf/PlatformWinCE.cmake:
     15
    1162013-04-15  Patrick Gansterer  <paroga@webkit.org>
    217

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

    r148004 r148463  
    227227)
    228228
     229if (WTF_USE_ICU_UNICODE)
     230    list(APPEND WTF_HEADERS
     231        unicode/icu/UnicodeIcu.h
     232    )
     233    list(APPEND WTF_SOURCES
     234        unicode/icu/CollatorICU.cpp
     235    )
     236    list(APPEND WTF_INCLUDE_DIRECTORIES
     237        ${ICU_INCLUDE_DIRS}
     238    )
     239    list(APPEND WTF_LIBRARIES
     240        ${ICU_I18N_LIBRARIES}
     241        ${ICU_LIBRARIES}
     242    )
     243elseif (WTF_USE_WCHAR_UNICODE)
     244    list(APPEND WTF_HEADERS
     245        unicode/wchar/UnicodeWchar.h
     246    )
     247    list(APPEND WTF_SOURCES
     248        unicode/CollatorDefault.cpp
     249        unicode/wchar/UnicodeWchar.cpp
     250    )
     251endif ()
     252
    229253WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    230254

  • trunk/Source/WTF/wtf/PlatformBlackBerry.cmake

    r136790 r148463  
    55    ThreadingPthreads.cpp
    66    blackberry/MainThreadBlackBerry.cpp
    7     unicode/icu/CollatorICU.cpp
    87)
    98

  • trunk/Source/WTF/wtf/PlatformEfl.cmake

    r144842 r148463  
    99    ThreadIdentifierDataPthreads.cpp
    1010    ThreadingPthreads.cpp
    11 
    12     unicode/icu/CollatorICU.cpp
    1311)
    1412
    … …  
    1816    ${GLIB_GIO_LIBRARIES}
    1917    ${GLIB_GOBJECT_LIBRARIES}
    20     ${ICU_LIBRARIES}
    21     ${ICU_I18N_LIBRARIES}
    2218    ${ECORE_LIBRARIES}
    2319    ${ECORE_EVAS_LIBRARIES}
    … …  
    3733    ${EVAS_INCLUDE_DIRS}
    3834    ${GLIB_INCLUDE_DIRS}
    39     ${ICU_INCLUDE_DIRS}
    4035    ${JAVASCRIPTCORE_DIR}/wtf/gobject
    4136    ${JAVASCRIPTCORE_DIR}/wtf/unicode

  • trunk/Source/WTF/wtf/PlatformWinCE.cmake

    r136790 r148463  
    1 list(APPEND WTF_HEADERS
    2     unicode/wchar/UnicodeWchar.h
    3 )
    4 
    51list(APPEND WTF_SOURCES
    62    NullPtr.cpp
    … …  
    117    threads/win/BinarySemaphoreWin.cpp
    128
    13     unicode/CollatorDefault.cpp
    14     unicode/wchar/UnicodeWchar.cpp
    15 
    169    win/MainThreadWin.cpp
    1710    win/OwnPtrWin.cpp

  • trunk/Source/WebCore/CMakeLists.txt

    r148363 r148463  
    27372737
    27382738
     2739if (WTF_USE_ICU_UNICODE)
     2740    list(APPEND WebCore_SOURCES
     2741        platform/text/TextBreakIteratorICU.cpp
     2742        platform/text/TextCodecICU.cpp
     2743        platform/text/TextEncodingDetectorICU.cpp
     2744    )
     2745    list(APPEND WebCore_INCLUDE_DIRECTORIES
     2746        ${ICU_INCLUDE_DIRS}
     2747    )
     2748    list(APPEND WebCore_LIBRARIES
     2749        ${ICU_LIBRARIES}
     2750    )
     2751elseif (WTF_USE_WCHAR_UNICODE)
     2752    list(APPEND WebCore_SOURCES
     2753        platform/text/TextEncodingDetectorNone.cpp
     2754
     2755        platform/text/wchar/TextBreakIteratorWchar.cpp
     2756    )
     2757endif ()
     2758
     2759
    27392760if (WTF_USE_LEVELDB)
    27402761    list(APPEND WebCore_INCLUDE_DIRECTORIES

  • trunk/Source/WebCore/ChangeLog

    r148458 r148463  
     12013-04-15  Patrick Gansterer  <paroga@webkit.org>
     2
     3        [CMake] Add WTF_USE_*_UNICODE variables
     4        https://bugs.webkit.org/show_bug.cgi?id=114556
     5
     6        Reviewed by Brent Fulgham.
     7
     8        WTF_USE_ICU_UNICODE and WTF_USE_WCHAR_UNICODE are used to
     9        reduce duplication in the platform specific CMake files.
     10
     11        * CMakeLists.txt:
     12        * PlatformBlackBerry.cmake:
     13        * PlatformEfl.cmake:
     14        * PlatformWinCE.cmake:
     15
    1162013-04-15  Eric Carlson  <eric.carlson@apple.com>
    217

  • trunk/Source/WebCore/PlatformBlackBerry.cmake

    r148129 r148463  
    3636    platform/posix/SharedBufferPOSIX.cpp
    3737    platform/text/LocaleNone.cpp
    38     platform/text/TextBreakIteratorICU.cpp
    39     platform/text/TextCodecICU.cpp
    40     platform/text/TextEncodingDetectorICU.cpp
    4138    platform/text/blackberry/TextBreakIteratorInternalICUBlackBerry.cpp
    4239)

  • trunk/Source/WebCore/PlatformEfl.cmake

    r147998 r148463  
    167167    platform/text/enchant/TextCheckerEnchant.cpp
    168168    platform/text/LocaleICU.cpp
    169     platform/text/TextBreakIteratorICU.cpp
    170     platform/text/TextCodecICU.cpp
    171     platform/text/TextEncodingDetectorICU.cpp
    172169)
    173170
    … …  
    221218    ${FONTCONFIG_LIBRARIES}
    222219    ${FREETYPE_LIBRARIES}
    223     ${ICU_LIBRARIES}
    224220    ${JPEG_LIBRARIES}
    225221    ${LIBXML2_LIBRARIES}
    … …  
    249245    ${EVAS_INCLUDE_DIRS}
    250246    ${FREETYPE_INCLUDE_DIRS}
    251     ${ICU_INCLUDE_DIRS}
    252247    ${LIBXML2_INCLUDE_DIR}
    253248    ${LIBXSLT_INCLUDE_DIR}

  • trunk/Source/WebCore/PlatformWinCE.cmake

    r147883 r148463  
    9999
    100100    platform/text/LocaleNone.cpp
    101     platform/text/TextEncodingDetectorNone.cpp
    102 
    103     platform/text/wchar/TextBreakIteratorWchar.cpp
    104101
    105102    platform/text/win/TextCodecWin.cpp

  • trunk/Source/cmake/OptionsBlackBerry.cmake

    r147960 r148463  
    44
    55set(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}-${PROJECT_VERSION})
     6
     7set(WTF_USE_ICU_UNICODE 1)
    68
    79add_definitions(-DDATA_DIR="${DATA_DIR}")

  • trunk/Source/cmake/OptionsEfl.cmake

    r148025 r148463  
    2828find_package(LibSoup 2.40.3 REQUIRED)
    2929
     30set(WTF_USE_ICU_UNICODE 1)
    3031set(WTF_USE_SOUP 1)
    3132

  • trunk/Source/cmake/OptionsWinCE.cmake

    r147040 r148463  
    11include(OptionsWindows)
     2
     3set(WTF_USE_WCHAR_UNICODE 1)
    24
    35add_definitions(-D_CE_CRT_ALLOW_WIN_MINMAX)
Note: See TracChangeset for help on using the changeset viewer.