Changeset 166503 in webkit


Ignore:
Timestamp:
Mar 31, 2014 8:05:36 AM (10 years ago)
Author:
rakuco@webkit.org
Message:

[CMake] Stop checking for WTF_USE_ICU_UNICODE.
https://bugs.webkit.org/show_bug.cgi?id=130965

Reviewed by Martin Robinson.

This is somewhat of a follow-up to r162782, which got rid of
WTF_USE_ICU_UNICODE in CMake but did not remove the check in JSC's
CMakeLists.txt. This meant the includes and libraries were not
being properly included since then.

  • CMakeLists.txt:
Location:
trunk/Source/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r166263 r166503  
    2828    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    2929    "${CMAKE_SOURCE_DIR}/Source"
     30    ${ICU_INCLUDE_DIRS}
    3031)
    3132
     
    529530set(JavaScriptCore_LIBRARIES
    530531    WTF
     532    ${ICU_I18N_LIBRARIES}
    531533)
    532 
    533 if (WTF_USE_ICU_UNICODE)
    534     list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
    535         ${ICU_INCLUDE_DIRS}
    536     )
    537     list(APPEND JavaScriptCore_LIBRARIES
    538         ${ICU_I18N_LIBRARIES}
    539     )
    540 endif ()
    541534
    542535if (WTF_USE_UDIS86)
  • trunk/Source/JavaScriptCore/ChangeLog

    r166493 r166503  
     12014-03-31  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
     2
     3        [CMake] Stop checking for WTF_USE_ICU_UNICODE.
     4        https://bugs.webkit.org/show_bug.cgi?id=130965
     5
     6        Reviewed by Martin Robinson.
     7
     8        This is somewhat of a follow-up to r162782, which got rid of
     9        WTF_USE_ICU_UNICODE in CMake but did not remove the check in JSC's
     10        CMakeLists.txt. This meant the includes and libraries were not
     11        being properly included since then.
     12
     13        * CMakeLists.txt:
     14
    1152014-03-31  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
    216
Note: See TracChangeset for help on using the changeset viewer.