[CMake] Apple builds should use ICU_INCLUDE_DIRS
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Apr 2019 16:57:22 +0000 (16:57 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Apr 2019 16:57:22 +0000 (16:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=196720

Reviewed by Konstantin Tokarev.

.:

The Apple platform is using ${DERIVED_SOURCES_WTF_DIR} for hosting the ICU headers.
Instead it should stage the headers into ${ICU_INCLUDE_DIRS} so no special handling
is needed.

* Source/cmake/OptionsJSCOnly.cmake:
* Source/cmake/OptionsMac.cmake:

Source/JavaScriptCore:

* PlatformMac.cmake:

Source/WebCore:

* PlatformMac.cmake:

Source/WebCore/PAL:

* pal/PlatformMac.cmake:

Source/WTF:

Copy ICU headers for Apple builds into ICU_INCLUDE_DIRS.

* CMakeLists.txt:
* wtf/PlatformMac.cmake:

Tools:

* TestWebKitAPI/PlatformMac.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244081 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformMac.cmake
Source/WTF/CMakeLists.txt
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformMac.cmake
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/PlatformMac.cmake
Source/WebCore/PlatformMac.cmake
Source/cmake/OptionsJSCOnly.cmake
Source/cmake/OptionsMac.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/PlatformMac.cmake

index 2261acd..7808d23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2019-04-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Apple builds should use ICU_INCLUDE_DIRS
+        https://bugs.webkit.org/show_bug.cgi?id=196720
+
+        Reviewed by Konstantin Tokarev.
+
+        The Apple platform is using ${DERIVED_SOURCES_WTF_DIR} for hosting the ICU headers.
+        Instead it should stage the headers into ${ICU_INCLUDE_DIRS} so no special handling
+        is needed.
+
+        * Source/cmake/OptionsJSCOnly.cmake:
+        * Source/cmake/OptionsMac.cmake:
+
 2019-04-08  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake][WinCairo] Separate copied headers into different directories
index 7408229..8c23d94 100644 (file)
@@ -1,3 +1,12 @@
+2019-04-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Apple builds should use ICU_INCLUDE_DIRS
+        https://bugs.webkit.org/show_bug.cgi?id=196720
+
+        Reviewed by Konstantin Tokarev.
+
+        * PlatformMac.cmake:
+
 2019-04-09  Saam barati  <sbarati@apple.com>
 
         Clean up Int52 code and some bugs in it
index be43ebd..d6814c4 100644 (file)
@@ -10,7 +10,6 @@ list(APPEND JavaScriptCore_UNIFIED_SOURCE_LIST_FILES
 )
 
 list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
-    ${DERIVED_SOURCES_WTF_DIR}
     ${JAVASCRIPTCORE_DIR}/disassembler/udis86
     ${JAVASCRIPTCORE_DIR}/inspector/cocoa
     ${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa
index f781272..9902ac8 100644 (file)
@@ -3,3 +3,9 @@ include(WebKitCommon)
 set_property(DIRECTORY . PROPERTY FOLDER "WTF")
 
 add_subdirectory(wtf)
+
+# Apple builds have the ICU headers checked into ${WTF_DIR}/icu
+# Copy them into ${ICU_INCLUDE_DIRS} so the build behaves like find_package was used
+if (APPLE)
+    file(COPY ${WTF_DIR}/icu/unicode DESTINATION ${ICU_INCLUDE_DIRS})
+endif ()
index d1ea215..7a57ee7 100644 (file)
@@ -1,3 +1,15 @@
+2019-04-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Apple builds should use ICU_INCLUDE_DIRS
+        https://bugs.webkit.org/show_bug.cgi?id=196720
+
+        Reviewed by Konstantin Tokarev.
+
+        Copy ICU headers for Apple builds into ICU_INCLUDE_DIRS.
+
+        * CMakeLists.txt:
+        * wtf/PlatformMac.cmake:
+
 2019-04-08  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake][WinCairo] Separate copied headers into different directories
index 9a1f510..d20a259 100644 (file)
@@ -84,7 +84,6 @@ list(APPEND WTF_PRIVATE_INCLUDE_DIRECTORIES
 )
 
 file(COPY mac/MachExceptions.defs DESTINATION ${DERIVED_SOURCES_WTF_DIR})
-file(COPY "${WTF_DIR}/icu/unicode" DESTINATION ${DERIVED_SOURCES_WTF_DIR})
 
 add_custom_command(
     OUTPUT
index 4532072..5773274 100644 (file)
@@ -1,3 +1,12 @@
+2019-04-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Apple builds should use ICU_INCLUDE_DIRS
+        https://bugs.webkit.org/show_bug.cgi?id=196720
+
+        Reviewed by Konstantin Tokarev.
+
+        * PlatformMac.cmake:
+
 2019-04-09  Jer Noble  <jer.noble@apple.com>
 
         Test for: 196095 Inband Text Track cues interspersed with Data cues can display out of order.
index 7fd57e8..901a2ac 100644 (file)
@@ -1,3 +1,12 @@
+2019-04-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Apple builds should use ICU_INCLUDE_DIRS
+        https://bugs.webkit.org/show_bug.cgi?id=196720
+
+        Reviewed by Konstantin Tokarev.
+
+        * pal/PlatformMac.cmake:
+
 2019-04-08  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake][WinCairo] Separate copied headers into different directories
index e41f9d9..4e7713a 100644 (file)
@@ -123,7 +123,6 @@ list(APPEND PAL_SOURCES
 )
 
 list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
-    "${DERIVED_SOURCES_WTF_DIR}"
     "${PAL_DIR}/pal/avfoundation"
     "${PAL_DIR}/pal/cf"
     "${PAL_DIR}/pal/cocoa"
index 4d72f9d..6ec65d8 100644 (file)
@@ -72,7 +72,6 @@ endif ()
 
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${CMAKE_SOURCE_DIR}/Source"
-    "${DERIVED_SOURCES_WTF_DIR}"
     "${THIRDPARTY_DIR}/ANGLE"
     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
     "${WEBCORE_DIR}/accessibility/mac"
index 9476adc..2affab7 100644 (file)
@@ -99,5 +99,6 @@ if (NOT APPLE)
     find_package(ICU REQUIRED)
 else ()
     add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
+    set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers)
     set(ICU_LIBRARIES libicucore.dylib)
 endif ()
index c39cfd1..fc944e1 100644 (file)
@@ -60,4 +60,5 @@ set(WebCore_LIBRARY_TYPE SHARED)
 set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
 
 add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
+set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers)
 set(ICU_LIBRARIES libicucore.dylib)
index ae46bbf..7409f5a 100644 (file)
@@ -1,3 +1,12 @@
+2019-04-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Apple builds should use ICU_INCLUDE_DIRS
+        https://bugs.webkit.org/show_bug.cgi?id=196720
+
+        Reviewed by Konstantin Tokarev.
+
+        * TestWebKitAPI/PlatformMac.cmake:
+
 2019-04-09  Jonathan Bedard  <jbedard@apple.com>
 
         iOS 12 Simulator Release WK2 frequently timing out while running layout tests
index 8c10a0a..5560242 100644 (file)
@@ -2,7 +2,6 @@ set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
 
 include_directories(
-    "${DERIVED_SOURCES_WTF_DIR}"
     "${FORWARDING_HEADERS_DIR}"
 )
 
@@ -19,7 +18,7 @@ list(APPEND test_wtf_LIBRARIES
     ${CARBON_LIBRARY}
     ${COCOA_LIBRARY}
     ${COREFOUNDATION_LIBRARY}
-    libicucore.dylib
+    ${ICU_LIBRARIES}
 )
 
 list(APPEND TestWebKitAPI_LIBRARIES