Title: [264253] trunk/Tools
- Revision
- 264253
- Author
- [email protected]
- Date
- 2020-07-10 19:37:25 -0700 (Fri, 10 Jul 2020)
Log Message
[TestWebKitAPI][Win] Remove WEBCORE_EXPORT and WEBCORE_TESTSUPPORT_EXPORT definitions in PlatformWin.cmake
https://bugs.webkit.org/show_bug.cgi?id=214212
Reviewed by Don Olmstead.
Those macros should be defined only by WebCore/platform/PlatformExportMacros.h.
* TestWebKitAPI/PlatformWin.cmake: Removed WEBCORE_EXPORT and WEBCORE_TESTSUPPORT_EXPORT.
Added STATICALLY_LINKED_WITH_WebCore=1 to TestWebCore_DEFINITIONS.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (264252 => 264253)
--- trunk/Tools/ChangeLog 2020-07-11 02:00:22 UTC (rev 264252)
+++ trunk/Tools/ChangeLog 2020-07-11 02:37:25 UTC (rev 264253)
@@ -1,3 +1,15 @@
+2020-07-10 Fujii Hironori <[email protected]>
+
+ [TestWebKitAPI][Win] Remove WEBCORE_EXPORT and WEBCORE_TESTSUPPORT_EXPORT definitions in PlatformWin.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=214212
+
+ Reviewed by Don Olmstead.
+
+ Those macros should be defined only by WebCore/platform/PlatformExportMacros.h.
+
+ * TestWebKitAPI/PlatformWin.cmake: Removed WEBCORE_EXPORT and WEBCORE_TESTSUPPORT_EXPORT.
+ Added STATICALLY_LINKED_WITH_WebCore=1 to TestWebCore_DEFINITIONS.
+
2020-07-10 Aakash Jain <[email protected]>
Add tvOS and watchOS support to built-product-archive
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (264252 => 264253)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2020-07-11 02:00:22 UTC (rev 264252)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2020-07-11 02:37:25 UTC (rev 264253)
@@ -6,12 +6,6 @@
list(APPEND wrapper_DEFINITIONS WIN_CAIRO)
endif ()
-set(webcore_DEFINITIONS
- STATICALLY_LINKED_WITH_PAL=1
- WEBCORE_EXPORT=
- WEBCORE_TESTSUPPORT_EXPORT=
-)
-
set(test_main_SOURCES
win/main.cpp
)
@@ -38,7 +32,10 @@
win/TestWebCoreStubs.cpp
)
-list(APPEND TestWebCore_DEFINITIONS ${webcore_DEFINITIONS})
+list(APPEND TestWebCore_DEFINITIONS
+ STATICALLY_LINKED_WITH_PAL=1
+ STATICALLY_LINKED_WITH_WebCore=1
+)
list(APPEND TestWebCore_LIBRARIES
$<TARGET_OBJECTS:WebCore>
@@ -105,8 +102,6 @@
win/HostWindow.cpp
)
- list(APPEND TestWebKitLegacy_DEFINITIONS ${webcore_DEFINITIONS})
-
list(APPEND TestWebKitLegacy_LIBRARIES
WebKit::WTF
)
@@ -144,8 +139,6 @@
)
endif ()
- list(APPEND TestWebKit_DEFINITIONS ${webcore_DEFINITIONS})
-
WEBKIT_WRAP_EXECUTABLE(TestWebKit
SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
LIBRARIES shlwapi
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
