Title: [261039] trunk
- Revision
- 261039
- Author
- pvol...@apple.com
- Date
- 2020-05-01 16:41:16 -0700 (Fri, 01 May 2020)
Log Message
[Win] Fix AppleWin build
https://bugs.webkit.org/show_bug.cgi?id=211324
Reviewed by Don Olmstead.
.:
Use correct target namespace.
* Source/cmake/target/WebCore.cmake:
Source/_javascript_Core:
Check if target WTF_CopyHeaders exists before using it.
* CMakeLists.txt:
Source/WebKitLegacy:
Remove unknown object target and fix link errors.
* PlatformWin.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (261038 => 261039)
--- trunk/ChangeLog 2020-05-01 23:38:22 UTC (rev 261038)
+++ trunk/ChangeLog 2020-05-01 23:41:16 UTC (rev 261039)
@@ -1,3 +1,14 @@
+2020-05-01 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=211324
+
+ Reviewed by Don Olmstead.
+
+ Use correct target namespace.
+
+ * Source/cmake/target/WebCore.cmake:
+
2020-05-01 Don Olmstead <don.olmst...@sony.com>
Use export macros on all platforms
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (261038 => 261039)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2020-05-01 23:38:22 UTC (rev 261038)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2020-05-01 23:41:16 UTC (rev 261039)
@@ -1372,7 +1372,10 @@
target_include_directories(LowLevelInterpreterLib
PRIVATE "$<TARGET_PROPERTY:_javascript_Core,INCLUDE_DIRECTORIES>")
-add_dependencies(LowLevelInterpreterLib WTF_CopyHeaders Bytecodes JSCBuiltins)
+add_dependencies(LowLevelInterpreterLib Bytecodes JSCBuiltins)
+if (TARGET WTF_CopyHeaders)
+ add_dependencies(LowLevelInterpreterLib WTF_CopyHeaders)
+endif ()
if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP)
message(STATUS "Enabling asm postprocessing")
Modified: trunk/Source/_javascript_Core/ChangeLog (261038 => 261039)
--- trunk/Source/_javascript_Core/ChangeLog 2020-05-01 23:38:22 UTC (rev 261038)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-05-01 23:41:16 UTC (rev 261039)
@@ -1,3 +1,14 @@
+2020-05-01 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=211324
+
+ Reviewed by Don Olmstead.
+
+ Check if target WTF_CopyHeaders exists before using it.
+
+ * CMakeLists.txt:
+
2020-05-01 Don Olmstead <don.olmst...@sony.com>
[GTK] Add additional exports to support hidden visibility
Modified: trunk/Source/WebKitLegacy/ChangeLog (261038 => 261039)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-05-01 23:38:22 UTC (rev 261038)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-05-01 23:41:16 UTC (rev 261039)
@@ -1,3 +1,14 @@
+2020-05-01 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=211324
+
+ Reviewed by Don Olmstead.
+
+ Remove unknown object target and fix link errors.
+
+ * PlatformWin.cmake:
+
2020-04-25 Darin Adler <da...@apple.com>
[Cocoa] Deal with another round of Xcode upgrade checks
Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (261038 => 261039)
--- trunk/Source/WebKitLegacy/PlatformWin.cmake 2020-05-01 23:38:22 UTC (rev 261038)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2020-05-01 23:41:16 UTC (rev 261039)
@@ -8,6 +8,7 @@
win/WebURLAuthenticationChallengeSenderCURL.cpp
)
list(APPEND WebKitLegacy_PRIVATE_LIBRARIES
+ $<TARGET_OBJECTS:WebCore>
OpenSSL::SSL
mfuuid.lib
strmiids.lib
@@ -23,6 +24,10 @@
CoreText${DEBUG_SUFFIX}
QuartzCore${DEBUG_SUFFIX}
libdispatch${DEBUG_SUFFIX}
+ libxml2${DEBUG_SUFFIX}
+ libxslt${DEBUG_SUFFIX}
+ zdll${DEBUG_SUFFIX}
+ SQLite3${DEBUG_SUFFIX}
)
endif ()
@@ -423,7 +428,6 @@
set_target_properties(WebKitLegacyGUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})
list(APPEND WebKitLegacy_PRIVATE_LIBRARIES
- $<TARGET_OBJECTS:WebCore>
Comctl32
Comsupp
Crypt32
Modified: trunk/Source/cmake/target/WebCore.cmake (261038 => 261039)
--- trunk/Source/cmake/target/WebCore.cmake 2020-05-01 23:38:22 UTC (rev 261038)
+++ trunk/Source/cmake/target/WebCore.cmake 2020-05-01 23:41:16 UTC (rev 261039)
@@ -9,7 +9,7 @@
set_target_properties(WebKit::WebCore PROPERTIES
IMPORTED_LOCATION ${WEBKIT_LIBRARIES_LINK_DIR}/WebCore${DEBUG_SUFFIX}.lib
# Should add Apple libraries here when https://bugs.webkit.org/show_bug.cgi?id=205085 lands
- INTERFACE_LINK_LIBRARIES "WebKit::WTF;WebCore::_javascript_Core"
+ INTERFACE_LINK_LIBRARIES "WebKit::WTF;WebKit::_javascript_Core"
)
set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private")
target_include_directories(WebKit::WebCore INTERFACE
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
