[CMake] Make WTF headers copies

https://bugs.webkit.org/show_bug.cgi?id=182274

Reviewed by Alex Christensen.

Source/ThirdParty:

* gtest/CMakeLists.txt:

Source/WebDriver:

* CMakeLists.txt:

Source/WTF:

* wtf/CMakeLists.txt:
* wtf/PlatformGTK.cmake:
* wtf/PlatformJSCOnly.cmake:
* wtf/PlatformMac.cmake:
* wtf/PlatformWPE.cmake:
* wtf/PlatformWin.cmake:

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

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index f76df62daf7eb565b9936f8934a540e56181aa8b..e52833474997e1b53823316b9200951e66e4cf20 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,12 @@
+2018-01-30  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make WTF headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182274
+
+        Reviewed by Alex Christensen.
+
+        * gtest/CMakeLists.txt:
+
 2018-01-27  Dan Bernstein  <mitz@apple.com>
 
         HaveInternalSDK includes should be "#include?"

diff --git a/Source/ThirdParty/gtest/CMakeLists.txt b/Source/ThirdParty/gtest/CMakeLists.txt
index e921f9523cedd84a9d3eaaecb11a9ff743e0b98c..d6169692147e1b63318e84368055734b733362e8 100755 (executable)
--- a/Source/ThirdParty/gtest/CMakeLists.txt
+++ b/Source/ThirdParty/gtest/CMakeLists.txt
@@ -10,6 +10,7 @@ set(GTEST_INCLUDE_DIRECTORIES
     "${GTEST_DIR}/include"
     "${JAVASCRIPTCORE_DIR}"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
+    "${FORWARDING_HEADERS_DIR}"
 )
 
 set(GTEST_SOURCES

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 971e1e04790674c60ed89ce831dde932c69380bf..98150e674f9c2010cccabcfa5031fc58288c8b8d 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,17 @@
+2018-01-30  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make WTF headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182274
+
+        Reviewed by Alex Christensen.
+
+        * wtf/CMakeLists.txt:
+        * wtf/PlatformGTK.cmake:
+        * wtf/PlatformJSCOnly.cmake:
+        * wtf/PlatformMac.cmake:
+        * wtf/PlatformWPE.cmake:
+        * wtf/PlatformWin.cmake:
+
 2018-01-30  Mark Lam  <mark.lam@apple.com>
 
         Move ENABLE_POISON to Platform.h.

diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
index 358fc8790f8e38a04de65f8a6e84a7b1e26d7326..c10bae970c3671b12d54316860d58f6b348875cc 100644 (file)
--- a/Source/WTF/wtf/CMakeLists.txt
+++ b/Source/WTF/wtf/CMakeLists.txt
@@ -1,13 +1,20 @@
 set(WTF_HEADERS
     ASCIICType.h
+    Algorithms.h
     Assertions.h
     Atomics.h
+    AutodrainedPool.h
     AutomaticThread.h
     BackwardsGraph.h
     Bag.h
     BagToHashMap.h
     BitVector.h
     Bitmap.h
+    BlockObjCExceptions.h
+    BlockPtr.h
+    BlockStack.h
+    BloomFilter.h
+    Box.h
     Brigand.h
     BubbleSort.h
     BumpPointerAllocator.h
@@ -15,15 +22,21 @@ set(WTF_HEADERS
     CPUTime.h
     CagedPtr.h
     CagedUniquePtr.h
+    CallbackAggregator.h
+    CheckedArithmetic.h
+    CheckedBoolean.h
     ClockType.h
+    CommaPrinter.h
     CompilationThread.h
     Compiler.h
+    CompletionHandler.h
     ConcurrentBuffer.h
     ConcurrentPtrHashSet.h
     ConcurrentVector.h
     Condition.h
     CountingLock.h
     CrossThreadCopier.h
+    CrossThreadQueue.h
     CrossThreadTask.h
     CrossThreadTaskHandler.h
     CryptographicUtilities.h
@@ -31,19 +44,29 @@ set(WTF_HEADERS
     CurrentTime.h
     DataLog.h
     DateMath.h
-    Dominators.h
+    DebugUtilities.h
     DecimalNumber.h
     DeferrableRefCounted.h
+    DeprecatedOptional.h
     Deque.h
     DisallowCType.h
+    DispatchPtr.h
+    Dominators.h
     DoublyLinkedList.h
     DumbPtrTraits.h
+    DumbValueTraits.h
+    EnumTraits.h
+    Expected.h
+    ExportMacros.h
+    FastBitVector.h
     FastMalloc.h
     FastTLS.h
     FeatureDefines.h
     FilePrintStream.h
     FlipBytes.h
+    ForbidHeapAllocation.h
     Forward.h
+    Function.h
     FunctionDispatcher.h
     GetPtr.h
     Gigacage.h
@@ -51,7 +74,6 @@ set(WTF_HEADERS
     GraphNodeWorklist.h
     GregorianDateTime.h
     HashCountedSet.h
-    Hasher.h
     HashFunctions.h
     HashIterators.h
     HashMap.h
@@ -59,23 +81,39 @@ set(WTF_HEADERS
     HashSet.h
     HashTable.h
     HashTraits.h
+    Hasher.h
     HexNumber.h
+    Identified.h
+    Indenter.h
+    IndexKeyType.h
     IndexMap.h
     IndexSet.h
     IndexSparseSet.h
     IndexedContainerIterator.h
+    InlineASM.h
+    Insertion.h
+    InstanceCounted.h
+    IsoMalloc.h
+    IsoMallocInlines.h
     IteratorAdaptors.h
     IteratorRange.h
     JSONValues.h
+    JSValueMalloc.h
+    KeyValuePair.h
+    LEBDecoder.h
     Language.h
+    ListDump.h
     ListHashSet.h
     Liveness.h
     Lock.h
-    LockAlgorithmInlines.h
     LockAlgorithm.h
+    LockAlgorithmInlines.h
     LockedPrintStream.h
     Locker.h
     LocklessBag.h
+    Logger.h
+    LoggerHelper.h
+    LoggingAccumulator.h
     LoggingHashID.h
     LoggingHashMap.h
     LoggingHashSet.h
@@ -90,14 +128,24 @@ set(WTF_HEADERS
     MessageQueue.h
     MetaAllocator.h
     MetaAllocatorHandle.h
-    NaturalLoops.h
     MonotonicTime.h
+    NakedPtr.h
+    NaturalLoops.h
+    NeverDestroyed.h
+    NoLock.h
+    NoTailCalls.h
     Noncopyable.h
+    NotFound.h
     NumberOfCores.h
     OSAllocator.h
+    OSObjectPtr.h
     OSRandomSource.h
+    ObjcRuntimeExtras.h
+    ObjectIdentifier.h
     OptionSet.h
+    Optional.h
     OrderMaker.h
+    PackedIntVector.h
     PageAllocation.h
     PageBlock.h
     PageReservation.h
@@ -110,10 +158,12 @@ set(WTF_HEADERS
     ParkingLot.h
     Platform.h
     PlatformRegisters.h
+    PointerComparison.h
     PointerPreparations.h
     Poisoned.h
     PoisonedUniquePtr.h
     PrintStream.h
+    PriorityQueue.h
     ProcessID.h
     RAMSize.h
     RandomDevice.h
@@ -123,22 +173,36 @@ set(WTF_HEADERS
     RangeSet.h
     RawPointer.h
     ReadWriteLock.h
+    RecursableLambda.h
     RecursiveLockAdapter.h
     RedBlackTree.h
     Ref.h
     RefCounted.h
+    RefCountedArray.h
     RefCountedLeakCounter.h
     RefCounter.h
     RefPtr.h
     RetainPtr.h
     RunLoop.h
+    RunLoopTimer.h
     SHA1.h
-    SharedTask.h
     SaturatedArithmetic.h
+    SchedulePair.h
+    Scope.h
     ScopedLambda.h
     Seconds.h
     SegmentedVector.h
+    SentinelLinkedList.h
+    SetForScope.h
+    SharedTask.h
+    SimpleStats.h
+    SingleRootGraph.h
+    SinglyLinkedList.h
+    SinglyLinkedListWithTail.h
+    SixCharacterHash.h
     SmallPtrSet.h
+    SoftLinking.h
+    Spectrum.h
     StackBounds.h
     StackShot.h
     StackShotProfiler.h
@@ -146,8 +210,11 @@ set(WTF_HEADERS
     StackTrace.h
     StdLibExtras.h
     Stopwatch.h
+    StreamBuffer.h
     StringExtras.h
+    StringHashDumpContext.h
     StringPrintStream.h
+    SynchronizedFixedQueue.h
     SystemFree.h
     SystemTracing.h
     ThreadGroup.h
@@ -158,9 +225,16 @@ set(WTF_HEADERS
     ThreadingPrimitives.h
     TimeWithDynamicClockType.h
     TimingScope.h
+    TinyLRUCache.h
     TinyPtrSet.h
+    TriState.h
+    TypeCasts.h
     UUID.h
+    Unexpected.h
+    UniStdExtras.h
+    UnionFind.h
     UniqueRef.h
+    UnsafePointer.h
     VMTags.h
     ValueCheck.h
     Variant.h
@@ -168,6 +242,8 @@ set(WTF_HEADERS
     VectorTraits.h
     WallTime.h
     WeakPtr.h
+    WeakRandom.h
+    WindowsExtras.h
     WordLock.h
     WorkQueue.h
     dtoa.h
@@ -183,32 +259,48 @@ set(WTF_HEADERS
     dtoa/strtod.h
     dtoa/utils.h
 
+    persistence/PersistentCoder.h
+    persistence/PersistentCoders.h
+    persistence/PersistentDecoder.h
+    persistence/PersistentEncoder.h
+
+    text/ASCIIFastPath.h
     text/AtomicString.h
+    text/AtomicStringHash.h
     text/AtomicStringImpl.h
     text/AtomicStringTable.h
     text/Base64.h
     text/CString.h
+    text/ConversionMode.h
     text/IntegerToStringConversion.h
     text/LChar.h
-    text/LineEnding.h
     text/LineBreakIteratorPoolICU.h
+    text/LineEnding.h
+    text/NullTextBreakIterator.h
+    text/OrdinalNumber.h
     text/StringBuffer.h
+    text/StringBuilder.h
     text/StringCommon.h
+    text/StringConcatenate.h
+    text/StringConcatenateNumbers.h
     text/StringHash.h
     text/StringHasher.h
     text/StringImpl.h
     text/StringMalloc.h
+    text/StringOperators.h
     text/StringVector.h
     text/StringView.h
     text/SymbolImpl.h
     text/SymbolRegistry.h
     text/TextBreakIterator.h
     text/TextBreakIteratorInternalICU.h
+    text/TextPosition.h
     text/TextStream.h
     text/UniquedStringImpl.h
     text/ValueToString.h
     text/WTFString.h
 
+    text/icu/TextBreakIteratorICU.h
     text/icu/UTextProvider.h
     text/icu/UTextProviderLatin1.h
     text/icu/UTextProviderUTF16.h
@@ -333,13 +425,13 @@ set(WTF_SOURCES
 
 set(WTF_INCLUDE_DIRECTORIES
     "${BMALLOC_DIR}"
-    "${WTF_DIR}"
     "${CMAKE_BINARY_DIR}"
     "${DERIVED_SOURCES_DIR}"
     "${THIRDPARTY_DIR}"
 )
 
 set(WTF_PRIVATE_INCLUDE_DIRECTORIES
+    "${WTF_DIR}"
     "${WTF_DIR}/wtf"
     "${WTF_DIR}/wtf/dtoa"
     "${WTF_DIR}/wtf/persistence"
@@ -353,15 +445,6 @@ set(WTF_LIBRARIES
     ${CMAKE_DL_LIBS}
 )
 
-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    list(APPEND WTF_HEADERS
-        spi/darwin/CommonCryptoSPI.h
-    )
-    list(APPEND WTF_INCLUDE_DIRECTORIES
-        "${WTF_DIR}/wtf/spi/darwin"
-    )
-endif ()
-
 if (NOT USE_SYSTEM_MALLOC)
     list(APPEND WTF_LIBRARIES bmalloc)
 endif ()
@@ -400,6 +483,11 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
 WEBKIT_FRAMEWORK(WTF)
 
+WEBKIT_MAKE_FORWARDING_HEADERS(WTF
+    DESTINATION ${FORWARDING_HEADERS_DIR}/wtf
+    FILES ${WTF_HEADERS}
+)
+
 if (MSVC)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")

diff --git a/Source/WTF/wtf/PlatformGTK.cmake b/Source/WTF/wtf/PlatformGTK.cmake
index da038a01fc30c3e4838fd376bc54a1e54c3be785..6ea6f89d0e8ef74723fb9487f7d8f300e2aa0535 100644 (file)
--- a/Source/WTF/wtf/PlatformGTK.cmake
+++ b/Source/WTF/wtf/PlatformGTK.cmake
@@ -1,8 +1,23 @@
 set(WTF_OUTPUT_NAME WTFGTK)
 
+list(APPEND WTF_HEADERS
+    glib/GLibUtilities.h
+    glib/GMutexLocker.h
+    glib/GRefPtr.h
+    glib/GTypedefs.h
+    glib/GUniquePtr.h
+    glib/RunLoopSourcePriority.h
+    glib/WTFGType.h
+
+    linux/CurrentProcessMemoryStatus.h
+)
+
 list(APPEND WTF_SOURCES
+    UniStdExtras.cpp
+
     generic/MainThreadGeneric.cpp
     generic/WorkQueueGeneric.cpp
+
     glib/GLibUtilities.cpp
     glib/GRefPtr.cpp
     glib/RunLoopGLib.cpp
@@ -11,12 +26,10 @@ list(APPEND WTF_SOURCES
     linux/MemoryFootprintLinux.cpp
     linux/MemoryPressureHandlerLinux.cpp
 
+    text/unix/TextBreakIteratorInternalICUUnix.cpp
+
     unix/CPUTimeUnix.cpp
     unix/LanguageUnix.cpp
-
-    UniStdExtras.cpp
-
-    text/unix/TextBreakIteratorInternalICUUnix.cpp
 )
 
 list(APPEND WTF_LIBRARIES

diff --git a/Source/WTF/wtf/PlatformJSCOnly.cmake b/Source/WTF/wtf/PlatformJSCOnly.cmake
index d1c76f792b4e98fe5ba245f4d4bbd0d23048e092..bb05cd2c90731c119cf46ccf6a8253b36eb654e5 100644 (file)
--- a/Source/WTF/wtf/PlatformJSCOnly.cmake
+++ b/Source/WTF/wtf/PlatformJSCOnly.cmake
@@ -1,20 +1,22 @@
 list(APPEND WTF_SOURCES
-
     generic/MainThreadGeneric.cpp
     generic/WorkQueueGeneric.cpp
 )
 
 if (WIN32)
     list(APPEND WTF_SOURCES
+        text/win/TextBreakIteratorInternalICUWin.cpp
+
         win/CPUTimeWin.cpp
         win/LanguageWin.cpp
-        text/win/TextBreakIteratorInternalICUWin.cpp
     )
 else ()
     list(APPEND WTF_SOURCES
+        text/unix/TextBreakIteratorInternalICUUnix.cpp
+
         unix/CPUTimeUnix.cpp
         unix/LanguageUnix.cpp
-        text/unix/TextBreakIteratorInternalICUUnix.cpp
+        unix/UniStdExtras.cpp
     )
 endif ()
 

diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake
index f071d2f0ebb0941aa7832f59a416809c25da2c41..273cc41f47278866c9cc4096953c2aa69697d0bd 100644 (file)
--- a/Source/WTF/wtf/PlatformMac.cmake
+++ b/Source/WTF/wtf/PlatformMac.cmake
@@ -7,6 +7,29 @@ list(APPEND WTF_LIBRARIES
     ${READLINE_LIBRARY}
 )
 
+list(APPEND WTF_HEADERS
+    cf/TypeCastsCF.h
+
+    cocoa/SoftLinking.h
+
+    darwin/WeakLinking.h
+
+    mac/AppKitCompatibilityDeclarations.h
+
+    spi/cf/CFBundleSPI.h
+    spi/cf/CFStringSPI.h
+
+    spi/cocoa/NSMapTableSPI.h
+    spi/cocoa/SecuritySPI.h
+
+    spi/darwin/CommonCryptoSPI.h
+    spi/darwin/SandboxSPI.h
+    spi/darwin/XPCSPI.h
+    spi/darwin/dyldSPI.h
+
+    text/cf/TextBreakIteratorCF.h
+)
+
 list(APPEND WTF_SOURCES
     AutodrainedPoolMac.mm
     BlockObjCExceptions.mm
@@ -37,7 +60,7 @@ list(APPEND WTF_SOURCES
     text/mac/StringViewObjC.mm
 )
 
-list(APPEND WTF_INCLUDE_DIRECTORIES
+list(APPEND WTF_PRIVATE_INCLUDE_DIRECTORIES
     "${WTF_DIR}/icu"
     "${WTF_DIR}/wtf/spi/darwin"
     ${DERIVED_SOURCES_WTF_DIR}

diff --git a/Source/WTF/wtf/PlatformWPE.cmake b/Source/WTF/wtf/PlatformWPE.cmake
index f39f8fb46eefd9a6470fb042af2438c8a239b30b..1c224f8a1d049d132ff38ee65f2e54ef0f3eb685 100644 (file)
--- a/Source/WTF/wtf/PlatformWPE.cmake
+++ b/Source/WTF/wtf/PlatformWPE.cmake
@@ -1,3 +1,15 @@
+list(APPEND WTF_HEADERS
+    glib/GLibUtilities.h
+    glib/GMutexLocker.h
+    glib/GRefPtr.h
+    glib/GTypedefs.h
+    glib/GUniquePtr.h
+    glib/RunLoopSourcePriority.h
+    glib/WTFGType.h
+
+    linux/CurrentProcessMemoryStatus.h
+)
+
 list(APPEND WTF_SOURCES
     UniStdExtras.cpp
 

diff --git a/Source/WTF/wtf/PlatformWin.cmake b/Source/WTF/wtf/PlatformWin.cmake
index a6cffaf450c92fabe999b39d69b35cdc4bf8c6dc..20d6b1735106b533c054006a667070c64312a16b 100644 (file)
--- a/Source/WTF/wtf/PlatformWin.cmake
+++ b/Source/WTF/wtf/PlatformWin.cmake
@@ -1,6 +1,10 @@
 list(APPEND WTF_HEADERS
-    cf/TypeCastsCF.h
     text/win/WCharStringExtras.h
+
+    win/GDIObject.h
+    win/SoftLinking.h
+    win/Win32Handle.h
+    win/WorkItemContext.h
 )
 
 list(APPEND WTF_SOURCES
@@ -17,6 +21,11 @@ list(APPEND WTF_SOURCES
 )
 
 if (USE_CF)
+    list(APPEND WTF_HEADERS
+        cf/TypeCastsCF.h
+
+        text/cf/TextBreakIteratorCF.h
+    )
     list(APPEND WTF_SOURCES
         text/cf/AtomicStringImplCF.cpp
         text/cf/StringCF.cpp
@@ -27,23 +36,4 @@ if (USE_CF)
     list(APPEND WTF_LIBRARIES ${COREFOUNDATION_LIBRARY})
 endif ()
 
-set(WTF_FORWARDING_HEADERS_DIRECTORIES
-    .
-    cf
-    dtoa
-    generic
-    persistence
-    spi
-    text
-    text/cf
-    text/icu
-    text/win
-    threads
-    unicode
-    win
-)
-WEBKIT_MAKE_FORWARDING_HEADERS(WTF
-    DESTINATION ${FORWARDING_HEADERS_DIR}/wtf
-    DIRECTORIES ${WTF_FORWARDING_HEADERS_DIRECTORIES})
-
 set(WTF_OUTPUT_NAME WTF${DEBUG_SUFFIX})

diff --git a/Source/WebDriver/CMakeLists.txt b/Source/WebDriver/CMakeLists.txt
index d5f5ec684e1caaf4061bc2446081ee63da625aa7..8bb1077788c9b919087333ec784f0c1642607bef 100644 (file)
--- a/Source/WebDriver/CMakeLists.txt
+++ b/Source/WebDriver/CMakeLists.txt
@@ -3,6 +3,7 @@ set_property(DIRECTORY . PROPERTY FOLDER "WebDriver")
 set(WebDriver_INCLUDE_DIRECTORIES
     "${WEBDRIVER_DIR}"
     "${DERIVED_SOURCES_WEBDRIVER_DIR}"
+    "${FORWARDING_HEADERS_DIR}"
 )
 
 set(WebDriver_SOURCES

diff --git a/Source/WebDriver/ChangeLog b/Source/WebDriver/ChangeLog
index fa5cf53dbdbd7d1de982adc6bc9b0cda4980ac68..d4a1d84098074e7851c85b75c804f484922a9e7e 100644 (file)
--- a/Source/WebDriver/ChangeLog
+++ b/Source/WebDriver/ChangeLog
@@ -1,3 +1,12 @@
+2018-01-30  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make WTF headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182274
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+
 2018-01-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         WebDriver: evaluateJavaScriptFunction should return null when return value is undefined