[CMake] Make PAL headers copies

https://bugs.webkit.org/show_bug.cgi?id=182645 Reviewed by Alex Christensen. Source/WebCore: No new tests. No change in behavior. * CMakeLists.txt: Source/WebCore/PAL: * pal/CMakeLists.txt: * pal/PlatformAppleWin.cmake: * pal/PlatformGTK.cmake: * pal/PlatformMac.cmake: * pal/PlatformWPE.cmake: * pal/PlatformWin.cmake: * pal/PlatformWinCairo.cmake: Tools: * TestWebKitAPI/CMakeLists.txt: Canonical link: https://commits.webkit.org/198475@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@228347 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Feb 10, 2018 · 330bf8dbd0703d424345308c3de0dfafd8a17122 · 330bf8d
1 parent 73afd91
commit 330bf8dbd0703d424345308c3de0dfafd8a17122
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
@@ -142,7 +142,6 @@ set(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/xml"
     "${WEBCORE_DIR}/xml/parser"
     "${DERIVED_SOURCES_WEBCORE_DIR}"
-    "${PAL_DIR}"
 )
 
 set(WebCore_SYSTEM_INCLUDE_DIRECTORIES

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2018-02-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make PAL headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182645
+
+        Reviewed by Alex Christensen.
+
+        No new tests. No change in behavior.
+
+        * CMakeLists.txt:
+
 2018-02-09  Zalan Bujtas  <zalan@apple.com>
 
         [RenderTreeBuilder] Move RenderRubyRun::takeChild mutation to a RenderTreeBuilder

diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,18 @@
+2018-02-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make PAL headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182645
+
+        Reviewed by Alex Christensen.
+
+        * pal/CMakeLists.txt:
+        * pal/PlatformAppleWin.cmake:
+        * pal/PlatformGTK.cmake:
+        * pal/PlatformMac.cmake:
+        * pal/PlatformWPE.cmake:
+        * pal/PlatformWin.cmake:
+        * pal/PlatformWinCairo.cmake:
+
 2018-01-30  Myles C. Maxfield  <mmaxfield@apple.com>
 
         A disallowed user-installed font may be used if its PostScript name is specified

diff --git a/Source/WebCore/PAL/pal/CMakeLists.txt b/Source/WebCore/PAL/pal/CMakeLists.txt
@@ -1,3 +1,24 @@
+set(PAL_HEADERS
+    ExportMacros.h
+    FileSizeFormatter.h
+    HysteresisActivity.h
+    LogInitialization.h
+    LogMacros.h
+    Logging.h
+    SessionID.h
+
+    crypto/CryptoDigest.h
+
+    system/Clock.h
+    system/ClockGeneric.h
+    system/SleepDisabler.h
+    system/Sound.h
+    system/SystemSleepListener.h
+
+    text/KillRing.h
+    text/UnencodableHandling.h
+)
+
 set(PAL_SOURCES
     FileSizeFormatter.cpp
     Logging.cpp
@@ -7,11 +28,8 @@ set(PAL_SOURCES
     system/SystemSleepListener.cpp
 )
 
-set(PAL_INCLUDE_DIRECTORIES
-    "${PAL_DIR}"
-)
-
 set(PAL_PRIVATE_INCLUDE_DIRECTORIES
+    "${PAL_DIR}"
     "${PAL_DIR}/pal"
     "${PAL_DIR}/pal/crypto"
     "${PAL_DIR}/pal/system"
@@ -31,3 +49,8 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})
 WEBKIT_FRAMEWORK(PAL)
+
+WEBKIT_MAKE_FORWARDING_HEADERS(PAL
+    DESTINATION ${FORWARDING_HEADERS_DIR}/pal
+    FILES ${PAL_HEADERS}
+)
diff --git a/Source/WebCore/PAL/pal/PlatformAppleWin.cmake b/Source/WebCore/PAL/pal/PlatformAppleWin.cmake
@@ -1,11 +1,27 @@
-list(APPEND PAL_FORWARDING_HEADERS_DIRECTORIES
-    spi/cf
+list(APPEND PAL_HEADERS
+    avfoundation/MediaTimeAVFoundation.h
+
+    cf/CoreMediaSoftLink.h
+
+    spi/cf/CFLocaleSPI.h
+    spi/cf/CFNetworkConnectionCacheSPI.h
+    spi/cf/CFNetworkSPI.h
+    spi/cf/CFUtilitiesSPI.h
+    spi/cf/CoreAudioSPI.h
+    spi/cf/CoreMediaSPI.h
+
+    spi/win/CoreTextSPIWin.h
 )
 
 if (${USE_DIRECT2D})
 else ()
-    list(APPEND PAL_FORWARDING_HEADERS_DIRECTORIES
-        spi/cg
+    list(APPEND PAL_HEADERS
+        spi/cg/CoreGraphicsSPI.h
+        spi/cg/ImageIOSPI.h
+    )
+
+    list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
+        "${PAL_DIR}/pal/spi/cg"
     )
 endif ()
 
@@ -16,5 +32,8 @@ list(APPEND PAL_SOURCES
 )
 
 list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
+    "${PAL_DIR}/pal/avfoundation"
     "${PAL_DIR}/pal/cf"
+    "${PAL_DIR}/pal/spi/cf"
+    "${PAL_DIR}/pal/spi/win"
 )
diff --git a/Source/WebCore/PAL/pal/PlatformGTK.cmake b/Source/WebCore/PAL/pal/PlatformGTK.cmake
@@ -1,3 +1,11 @@
+list(APPEND PAL_HEADERS
+    crypto/gcrypt/Handle.h
+    crypto/gcrypt/Initialization.h
+    crypto/gcrypt/Utilities.h
+
+    system/glib/SleepDisablerGLib.h
+)
+
 list(APPEND PAL_SOURCES
     crypto/gcrypt/CryptoDigestGCrypt.cpp
 
@@ -13,6 +21,10 @@ list(APPEND PAL_SOURCES
 )
 
 if (ENABLE_SUBTLE_CRYPTO)
+    list(APPEND PAL_HEADERS
+        crypto/tasn1/Utilities.h
+    )
+
     list(APPEND PAL_SOURCES
         crypto/tasn1/Utilities.cpp
     )

diff --git a/Source/WebCore/PAL/pal/PlatformMac.cmake b/Source/WebCore/PAL/pal/PlatformMac.cmake
@@ -1,3 +1,95 @@
+list(APPEND PAL_HEADERS
+    avfoundation/MediaTimeAVFoundation.h
+
+    cf/CoreMediaSoftLink.h
+
+    spi/cf/CFLocaleSPI.h
+    spi/cf/CFNetworkConnectionCacheSPI.h
+    spi/cf/CFNetworkSPI.h
+    spi/cf/CFUtilitiesSPI.h
+    spi/cf/CoreAudioSPI.h
+    spi/cf/CoreMediaSPI.h
+
+    spi/cg/CoreGraphicsSPI.h
+    spi/cg/ImageIOSPI.h
+
+    spi/cocoa/AVKitSPI.h
+    spi/cocoa/CFNSURLConnectionSPI.h
+    spi/cocoa/CoreTextSPI.h
+    spi/cocoa/DataDetectorsCoreSPI.h
+    spi/cocoa/FoundationSPI.h
+    spi/cocoa/IOPMLibSPI.h
+    spi/cocoa/IOPSLibSPI.h
+    spi/cocoa/IOReturnSPI.h
+    spi/cocoa/IOSurfaceSPI.h
+    spi/cocoa/IOTypesSPI.h
+    spi/cocoa/LaunchServicesSPI.h
+    spi/cocoa/LinkPresentationSPI.h
+    spi/cocoa/MachVMSPI.h
+    spi/cocoa/NEFilterSourceSPI.h
+    spi/cocoa/NSAttributedStringSPI.h
+    spi/cocoa/NSButtonCellSPI.h
+    spi/cocoa/NSCalendarDateSPI.h
+    spi/cocoa/NSColorSPI.h
+    spi/cocoa/NSExtensionSPI.h
+    spi/cocoa/NSFileManagerSPI.h
+    spi/cocoa/NSFileSizeFormatterSPI.h
+    spi/cocoa/NSKeyedArchiverSPI.h
+    spi/cocoa/NSStringSPI.h
+    spi/cocoa/NSTouchBarSPI.h
+    spi/cocoa/NSURLConnectionSPI.h
+    spi/cocoa/NSURLDownloadSPI.h
+    spi/cocoa/NSURLFileTypeMappingsSPI.h
+    spi/cocoa/PassKitSPI.h
+    spi/cocoa/QuartzCoreSPI.h
+    spi/cocoa/ServersSPI.h
+    spi/cocoa/WebFilterEvaluatorSPI.h
+    spi/cocoa/pthreadSPI.h
+
+    spi/mac/AVFoundationSPI.h
+    spi/mac/DataDetectorsSPI.h
+    spi/mac/HIServicesSPI.h
+    spi/mac/HIToolboxSPI.h
+    spi/mac/LookupSPI.h
+    spi/mac/MediaRemoteSPI.h
+    spi/mac/MetadataSPI.h
+    spi/mac/NSAccessibilitySPI.h
+    spi/mac/NSApplicationSPI.h
+    spi/mac/NSCellSPI.h
+    spi/mac/NSEventSPI.h
+    spi/mac/NSFontSPI.h
+    spi/mac/NSGraphicsSPI.h
+    spi/mac/NSImmediateActionGestureRecognizerSPI.h
+    spi/mac/NSMenuSPI.h
+    spi/mac/NSPasteboardSPI.h
+    spi/mac/NSPopoverSPI.h
+    spi/mac/NSResponderSPI.h
+    spi/mac/NSScrollViewSPI.h
+    spi/mac/NSScrollerImpSPI.h
+    spi/mac/NSScrollingInputFilterSPI.h
+    spi/mac/NSScrollingMomentumCalculatorSPI.h
+    spi/mac/NSSharingServicePickerSPI.h
+    spi/mac/NSSharingServiceSPI.h
+    spi/mac/NSSpellCheckerSPI.h
+    spi/mac/NSTextFinderSPI.h
+    spi/mac/NSViewSPI.h
+    spi/mac/NSWindowSPI.h
+    spi/mac/PIPSPI.h
+    spi/mac/QTKitSPI.h
+    spi/mac/QuickDrawSPI.h
+    spi/mac/QuickLookMacSPI.h
+    spi/mac/SpeechSynthesisSPI.h
+    spi/mac/TUCallSPI.h
+
+    system/cocoa/SleepDisablerCocoa.h
+
+    system/mac/ClockCM.h
+    system/mac/DefaultSearchProvider.h
+    system/mac/PopupMenu.h
+    system/mac/SystemSleepListenerMac.h
+    system/mac/WebPanel.h
+)
+
 list(APPEND PAL_SOURCES
     avfoundation/MediaTimeAVFoundation.cpp
 
@@ -21,8 +113,10 @@ list(APPEND PAL_SOURCES
 )
 
 list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
+    "${PAL_DIR}/pal/avfoundation"
     "${PAL_DIR}/pal/cf"
     "${PAL_DIR}/pal/spi/cf"
+    "${PAL_DIR}/pal/spi/cg"
     "${PAL_DIR}/pal/spi/cocoa"
     "${PAL_DIR}/pal/spi/mac"
 )
diff --git a/Source/WebCore/PAL/pal/PlatformWPE.cmake b/Source/WebCore/PAL/pal/PlatformWPE.cmake
@@ -1,3 +1,11 @@
+list(APPEND PAL_HEADERS
+    crypto/gcrypt/Handle.h
+    crypto/gcrypt/Initialization.h
+    crypto/gcrypt/Utilities.h
+
+    system/glib/SleepDisablerGLib.h
+)
+
 list(APPEND PAL_SOURCES
     crypto/gcrypt/CryptoDigestGCrypt.cpp
 
@@ -12,6 +20,10 @@ list(APPEND PAL_SOURCES
 )
 
 if (ENABLE_SUBTLE_CRYPTO)
+    list(APPEND PAL_HEADERS
+        crypto/tasn1/Utilities.h
+    )
+
     list(APPEND PAL_SOURCES
         crypto/tasn1/Utilities.cpp
     )

diff --git a/Source/WebCore/PAL/pal/PlatformWin.cmake b/Source/WebCore/PAL/pal/PlatformWin.cmake
@@ -16,11 +16,6 @@ list(APPEND PAL_INCLUDE_DIRECTORIES
     "${DERIVED_SOURCES_PAL_DIR}"
 )
 
-list(APPEND PAL_FORWARDING_HEADERS_DIRECTORIES
-    .
-    text
-)
-
 if (${WTF_PLATFORM_WIN_CAIRO})
     include(PlatformWinCairo.cmake)
 else ()
@@ -29,15 +24,6 @@ endif ()
 
 set(PAL_OUTPUT_NAME PAL${DEBUG_SUFFIX})
 
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebCore/pal)
-foreach (_directory ${PAL_FORWARDING_HEADERS_DIRECTORIES})
-    file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebCore/pal/${_directory})
-    file(GLOB _files "${PAL_DIR}/pal/${_directory}/*.h")
-    foreach (_file ${_files})
-        file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/WebCore/pal/${_directory})
-    endforeach ()
-endforeach ()
-
 # Generate PALHeaderDetection.h by PAL_PreBuild
 add_custom_target(PAL_PreBuild SOURCES "${DERIVED_SOURCES_PAL_DIR}/PALHeaderDetection.h")
 add_custom_command(

diff --git a/Source/WebCore/PAL/pal/PlatformWinCairo.cmake b/Source/WebCore/PAL/pal/PlatformWinCairo.cmake
@@ -1,2 +1,2 @@
-list(APPEND PAL_FORWARDING_HEADERS_DIRECTORIES
+list(APPEND PAL_HEADERS
 )
diff --git a/Source/WebKit/PlatformMac.cmake b/Source/WebKit/PlatformMac.cmake
@@ -389,7 +389,6 @@ list(APPEND WebKit_SOURCES
 )
 
 list(APPEND WebKit_INCLUDE_DIRECTORIES
-    "${PAL_DIR}"
     "${WEBKIT_DIR}/NetworkProcess/cocoa"
     "${WEBKIT_DIR}/NetworkProcess/mac"
     "${WEBKIT_DIR}/PluginProcess/mac"

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2018-02-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make PAL headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182645
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/CMakeLists.txt:
+
 2018-02-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Pasting from Excel no longer provides text/html data

diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt
@@ -169,7 +169,6 @@ include_directories(
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/Source
     ${JAVASCRIPTCORE_DIR}
-    ${PAL_DIR}
     ${THIRDPARTY_DIR}/gtest/include
     ${WEBKIT_DIR}/Platform/IPC
     ${WEBKIT_DIR}/Shared