[Win] WebCoreTestSupport is too big to link
authorross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Aug 2019 20:12:56 +0000 (20:12 +0000)
committerross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Aug 2019 20:12:56 +0000 (20:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=200820

Reviewed by Don Olmstead.

* Source/cmake/OptionsWin.cmake:
As with WebCore itself, build WebCoreTestSupport as an object library when unified builds are disabled
(and we haven't explicitly asked to build it as a shared library).

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

ChangeLog
Source/cmake/OptionsWin.cmake

index 98d2856..e5a335e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2019-08-16  Ross Kirsling  <ross.kirsling@sony.com>
+
+        [Win] WebCoreTestSupport is too big to link
+        https://bugs.webkit.org/show_bug.cgi?id=200820
+
+        Reviewed by Don Olmstead.
+
+        * Source/cmake/OptionsWin.cmake:
+        As with WebCore itself, build WebCoreTestSupport as an object library when unified builds are disabled
+        (and we haven't explicitly asked to build it as a shared library).
+
 2019-08-08  Brent Fulgham  <bfulgham@apple.com>
 
         [FTW] Get WebKit, WebKit2, and MiniBrowser building and executing
 2019-08-08  Brent Fulgham  <bfulgham@apple.com>
 
         [FTW] Get WebKit, WebKit2, and MiniBrowser building and executing
index dcb07d1..07153ee 100644 (file)
@@ -162,8 +162,13 @@ set(WTF_LIBRARY_TYPE SHARED)
 set(PAL_LIBRARY_TYPE STATIC)
 set(WebKitLegacy_LIBRARY_TYPE SHARED)
 
 set(PAL_LIBRARY_TYPE STATIC)
 set(WebKitLegacy_LIBRARY_TYPE SHARED)
 
-if (NOT ENABLE_UNIFIED_BUILDS AND WebCore_LIBRARY_TYPE MATCHES STATIC)
-    set(WebCore_LIBRARY_TYPE OBJECT)
+if (NOT ENABLE_UNIFIED_BUILDS)
+    if (WebCore_LIBRARY_TYPE MATCHES STATIC)
+        set(WebCore_LIBRARY_TYPE OBJECT)
+    endif ()
+    if (WebCoreTestSupport_LIBRARY_TYPE MATCHES STATIC)
+        set(WebCoreTestSupport_LIBRARY_TYPE OBJECT)
+    endif ()
 endif ()
 
 # If <winsock2.h> is not included before <windows.h> redefinition errors occur
 endif ()
 
 # If <winsock2.h> is not included before <windows.h> redefinition errors occur