[CMake][Win] Forwarding headers of WTF and PAL are copied twice in Visual Studio...

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

Reviewed by Alex Christensen.

Source/WebCore/PAL:

* pal/CMakeLists.txt:
* pal/PlatformAppleWin.cmake:
* pal/PlatformGTK.cmake:
* pal/PlatformMac.cmake:
* pal/PlatformWPE.cmake:
* pal/PlatformWinCairo.cmake:

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@229572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index bfcf6b3..6efb6f5 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,17 @@
+2018-03-12  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake][Win] Forwarding headers of WTF and PAL are copied twice in Visual Studio builds
+        https://bugs.webkit.org/show_bug.cgi?id=183240
+
+        Reviewed by Alex Christensen.
+
+        * wtf/CMakeLists.txt:
+        * wtf/PlatformGTK.cmake:
+        * wtf/PlatformJSCOnly.cmake:
+        * wtf/PlatformMac.cmake:
+        * wtf/PlatformWPE.cmake:
+        * wtf/PlatformWin.cmake:
+
 2018-03-12  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         Unreviewed, include time.h

diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
index 87803de..1a2c4f6 100644 (file)
--- a/Source/WTF/wtf/CMakeLists.txt
+++ b/Source/WTF/wtf/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(WTF_HEADERS
+set(WTF_PUBLIC_HEADERS
     ASCIICType.h
     Algorithms.h
     Assertions.h
@@ -447,7 +447,7 @@ set(WTF_LIBRARIES
 )
 
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    list(APPEND WTF_HEADERS
+    list(APPEND WTF_PUBLIC_HEADERS
         spi/darwin/CommonCryptoSPI.h
     )
 list(APPEND WTF_PRIVATE_INCLUDE_DIRECTORIES
@@ -497,7 +497,7 @@ WEBKIT_FRAMEWORK(WTF)
 
 WEBKIT_MAKE_FORWARDING_HEADERS(WTF
     DESTINATION ${FORWARDING_HEADERS_DIR}/wtf
-    FILES ${WTF_HEADERS}
+    FILES ${WTF_PUBLIC_HEADERS}
 )
 
 if (MSVC)

diff --git a/Source/WTF/wtf/PlatformGTK.cmake b/Source/WTF/wtf/PlatformGTK.cmake
index 6ea6f89..46903c3 100644 (file)
--- a/Source/WTF/wtf/PlatformGTK.cmake
+++ b/Source/WTF/wtf/PlatformGTK.cmake
@@ -1,6 +1,6 @@
 set(WTF_OUTPUT_NAME WTFGTK)
 
-list(APPEND WTF_HEADERS
+list(APPEND WTF_PUBLIC_HEADERS
     glib/GLibUtilities.h
     glib/GMutexLocker.h
     glib/GRefPtr.h

diff --git a/Source/WTF/wtf/PlatformJSCOnly.cmake b/Source/WTF/wtf/PlatformJSCOnly.cmake
index e560803..f610c6e 100644 (file)
--- a/Source/WTF/wtf/PlatformJSCOnly.cmake
+++ b/Source/WTF/wtf/PlatformJSCOnly.cmake
@@ -10,7 +10,7 @@ if (WIN32)
         win/CPUTimeWin.cpp
         win/LanguageWin.cpp
     )
-    list(APPEND WTF_HEADERS
+    list(APPEND WTF_PUBLIC_HEADERS
         text/win/WCharStringExtras.h
     )
 else ()

diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake
index 418fd32..4548390 100644 (file)
--- a/Source/WTF/wtf/PlatformMac.cmake
+++ b/Source/WTF/wtf/PlatformMac.cmake
@@ -7,7 +7,7 @@ list(APPEND WTF_LIBRARIES
     ${READLINE_LIBRARY}
 )
 
-list(APPEND WTF_HEADERS
+list(APPEND WTF_PUBLIC_HEADERS
     cf/TypeCastsCF.h
 
     cocoa/SoftLinking.h

diff --git a/Source/WTF/wtf/PlatformWPE.cmake b/Source/WTF/wtf/PlatformWPE.cmake
index 1c224f8..752b599 100644 (file)
--- a/Source/WTF/wtf/PlatformWPE.cmake
+++ b/Source/WTF/wtf/PlatformWPE.cmake
@@ -1,4 +1,4 @@
-list(APPEND WTF_HEADERS
+list(APPEND WTF_PUBLIC_HEADERS
     glib/GLibUtilities.h
     glib/GMutexLocker.h
     glib/GRefPtr.h

diff --git a/Source/WTF/wtf/PlatformWin.cmake b/Source/WTF/wtf/PlatformWin.cmake
index 20d6b17..014d739 100644 (file)
--- a/Source/WTF/wtf/PlatformWin.cmake
+++ b/Source/WTF/wtf/PlatformWin.cmake
@@ -1,4 +1,4 @@
-list(APPEND WTF_HEADERS
+list(APPEND WTF_PUBLIC_HEADERS
     text/win/WCharStringExtras.h
 
     win/GDIObject.h
@@ -21,7 +21,7 @@ list(APPEND WTF_SOURCES
 )
 
 if (USE_CF)
-    list(APPEND WTF_HEADERS
+    list(APPEND WTF_PUBLIC_HEADERS
         cf/TypeCastsCF.h
 
         text/cf/TextBreakIteratorCF.h

diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
index d8cd3a1..ec9b9f5 100644 (file)
--- a/Source/WebCore/PAL/ChangeLog
+++ b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,17 @@
+2018-03-12  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake][Win] Forwarding headers of WTF and PAL are copied twice in Visual Studio builds
+        https://bugs.webkit.org/show_bug.cgi?id=183240
+
+        Reviewed by Alex Christensen.
+
+        * pal/CMakeLists.txt:
+        * pal/PlatformAppleWin.cmake:
+        * pal/PlatformGTK.cmake:
+        * pal/PlatformMac.cmake:
+        * pal/PlatformWPE.cmake:
+        * pal/PlatformWinCairo.cmake:
+
 2018-03-12  Tim Horton  <timothy_horton@apple.com>
 
         Stop using SDK conditionals to control feature definitions

diff --git a/Source/WebCore/PAL/pal/CMakeLists.txt b/Source/WebCore/PAL/pal/CMakeLists.txt
index 82684f4..aebe481 100644 (file)
--- a/Source/WebCore/PAL/pal/CMakeLists.txt
+++ b/Source/WebCore/PAL/pal/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(PAL_HEADERS
+set(PAL_PUBLIC_HEADERS
     ExportMacros.h
     FileSizeFormatter.h
     HysteresisActivity.h
@@ -52,5 +52,5 @@ WEBKIT_FRAMEWORK(PAL)
 
 WEBKIT_MAKE_FORWARDING_HEADERS(PAL
     DESTINATION ${FORWARDING_HEADERS_DIR}/pal
-    FILES ${PAL_HEADERS}
+    FILES ${PAL_PUBLIC_HEADERS}
 )

diff --git a/Source/WebCore/PAL/pal/PlatformAppleWin.cmake b/Source/WebCore/PAL/pal/PlatformAppleWin.cmake
index c92de5b..3521652 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformAppleWin.cmake
+++ b/Source/WebCore/PAL/pal/PlatformAppleWin.cmake
@@ -1,4 +1,4 @@
-list(APPEND PAL_HEADERS
+list(APPEND PAL_PUBLIC_HEADERS
     avfoundation/MediaTimeAVFoundation.h
 
     cf/CoreMediaSoftLink.h
@@ -15,7 +15,7 @@ list(APPEND PAL_HEADERS
 
 if (${USE_DIRECT2D})
 else ()
-    list(APPEND PAL_HEADERS
+    list(APPEND PAL_PUBLIC_HEADERS
         spi/cg/CoreGraphicsSPI.h
         spi/cg/ImageIOSPI.h
     )

diff --git a/Source/WebCore/PAL/pal/PlatformGTK.cmake b/Source/WebCore/PAL/pal/PlatformGTK.cmake
index e6a03c2..ad4142b 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformGTK.cmake
+++ b/Source/WebCore/PAL/pal/PlatformGTK.cmake
@@ -1,4 +1,4 @@
-list(APPEND PAL_HEADERS
+list(APPEND PAL_PUBLIC_HEADERS
     crypto/gcrypt/Handle.h
     crypto/gcrypt/Initialization.h
     crypto/gcrypt/Utilities.h
@@ -21,7 +21,7 @@ list(APPEND PAL_SOURCES
 )
 
 if (ENABLE_SUBTLE_CRYPTO)
-    list(APPEND PAL_HEADERS
+    list(APPEND PAL_PUBLIC_HEADERS
         crypto/tasn1/Utilities.h
     )
 

diff --git a/Source/WebCore/PAL/pal/PlatformMac.cmake b/Source/WebCore/PAL/pal/PlatformMac.cmake
index 46e9ae3..3900574 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformMac.cmake
+++ b/Source/WebCore/PAL/pal/PlatformMac.cmake
@@ -1,4 +1,4 @@
-list(APPEND PAL_HEADERS
+list(APPEND PAL_PUBLIC_HEADERS
     avfoundation/MediaTimeAVFoundation.h
 
     cf/CoreMediaSoftLink.h

diff --git a/Source/WebCore/PAL/pal/PlatformWPE.cmake b/Source/WebCore/PAL/pal/PlatformWPE.cmake
index d0df9cf..c014099 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformWPE.cmake
+++ b/Source/WebCore/PAL/pal/PlatformWPE.cmake
@@ -1,4 +1,4 @@
-list(APPEND PAL_HEADERS
+list(APPEND PAL_PUBLIC_HEADERS
     crypto/gcrypt/Handle.h
     crypto/gcrypt/Initialization.h
     crypto/gcrypt/Utilities.h
@@ -20,7 +20,7 @@ list(APPEND PAL_SOURCES
 )
 
 if (ENABLE_SUBTLE_CRYPTO)
-    list(APPEND PAL_HEADERS
+    list(APPEND PAL_PUBLIC_HEADERS
         crypto/tasn1/Utilities.h
     )
 

diff --git a/Source/WebCore/PAL/pal/PlatformWinCairo.cmake b/Source/WebCore/PAL/pal/PlatformWinCairo.cmake
index cb096b6..d82629a 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformWinCairo.cmake
+++ b/Source/WebCore/PAL/pal/PlatformWinCairo.cmake
@@ -1,2 +1,2 @@
-list(APPEND PAL_HEADERS
+list(APPEND PAL_PUBLIC_HEADERS
 )