Fix Mac CMake build.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 17 Jun 2017 01:10:42 +0000 (01:10 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 17 Jun 2017 01:10:42 +0000 (01:10 +0000)
.:

* Source/cmake/WebKitFS.cmake:
Add new DerivedSources/WTF directory.

Source/WTF:

* wtf/PlatformMac.cmake:
Generate MachExceptionsServer.h

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

ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformMac.cmake
Source/cmake/WebKitFS.cmake

index d6c54fd..0bae9e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-06-16  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * Source/cmake/WebKitFS.cmake:
+        Add new DerivedSources/WTF directory.
+
 2017-06-15  Konstantin Tokarev  <annulen@yandex.ru>
 
         [cmake] ADD_PRECOMPILED_HEADER should append OBJECT_DEPENDS, not overwrite it
index 9596126..277a803 100644 (file)
@@ -1,3 +1,10 @@
+2017-06-16  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * wtf/PlatformMac.cmake:
+        Generate MachExceptionsServer.h
+
 2017-06-16  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [iOS DnD] Upstream iOS drag and drop implementation into OpenSource WebKit
index b468a5d..112d436 100644 (file)
@@ -43,4 +43,25 @@ list(APPEND WTF_SOURCES
 list(APPEND WTF_INCLUDE_DIRECTORIES
     "${WTF_DIR}/icu"
     "${WTF_DIR}/wtf/spi/darwin"
+    ${DERIVED_SOURCES_WTF_DIR}
 )
+
+file(COPY mac/MachExceptions.defs DESTINATION ${DERIVED_SOURCES_WTF_DIR})
+
+add_custom_command(
+    OUTPUT
+        ${DERIVED_SOURCES_WTF_DIR}/MachExceptionsServer.h
+        ${DERIVED_SOURCES_WTF_DIR}/mach_exc.h
+        ${DERIVED_SOURCES_WTF_DIR}/mach_excServer.c
+        ${DERIVED_SOURCES_WTF_DIR}/mach_excUser.c
+    MAIN_DEPENDENCY mac/MachExceptions.defs
+    WORKING_DIRECTORY ${DERIVED_SOURCES_WTF_DIR}
+    COMMAND mig -sheader MachExceptionsServer.h MachExceptions.defs
+    VERBATIM)
+list(APPEND WTF_SOURCES
+    ${DERIVED_SOURCES_WTF_DIR}/mach_excServer.c
+    ${DERIVED_SOURCES_WTF_DIR}/mach_excUser.c
+)
+
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${FORWARDING_HEADERS_DIR}/WebKitLegacy)
index a680ed4..9be6038 100644 (file)
@@ -33,6 +33,7 @@ set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitL
 set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
 set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
+set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
 
 set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)