Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit bce1ebd

Browse filesBrowse files
committed
[Win] Fix AppleWin build
https://bugs.webkit.org/show_bug.cgi?id=208330 Reviewed by Don Olmstead. Set framework headers directory for AppleWin build. * Source/cmake/target/TargetJavaScriptCore.cmake: * Source/cmake/target/TargetWTF.cmake: Canonical link: https://commits.webkit.org/221268@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257595 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 492fbf1 commit bce1ebd
Copy full SHA for bce1ebd

3 files changed

+16Lines changed: 16 additions & 0 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎ChangeLog‎

Copy file name to clipboardExpand all lines: ChangeLog
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2020-02-27 Per Arne Vollan <pvollan@apple.com>
2+
3+
[Win] Fix AppleWin build
4+
https://bugs.webkit.org/show_bug.cgi?id=208330
5+
6+
Reviewed by Don Olmstead.
7+
8+
Set framework headers directory for AppleWin build.
9+
10+
* Source/cmake/target/TargetJavaScriptCore.cmake:
11+
* Source/cmake/target/TargetWTF.cmake:
12+
113
2020-02-27 Don Olmstead <don.olmstead@sony.com>
214

315
[CMake] Add WebKit::PAL target
Collapse file

‎Source/cmake/target/TargetJavaScriptCore.cmake‎

Copy file name to clipboardExpand all lines: Source/cmake/target/TargetJavaScriptCore.cmake
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ if (NOT TARGET WebKit::JavaScriptCore)
1212
# Should add Apple::CoreFoundation here when https://bugs.webkit.org/show_bug.cgi?id=205085 lands
1313
INTERFACE_LINK_LIBRARIES "WebKit::WTF;ICU::data;ICU::i18n;ICU::uc"
1414
)
15+
set(JavaScriptCore_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore")
16+
set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${JavaScriptCore_FRAMEWORK_HEADERS_DIR})
17+
1518
target_include_directories(WebKit::JavaScriptCore INTERFACE
1619
${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
1720
${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
Collapse file

‎Source/cmake/target/TargetWTF.cmake‎

Copy file name to clipboardExpand all lines: Source/cmake/target/TargetWTF.cmake
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if (NOT TARGET WebKit::WTF)
1212
# Should add Apple::CoreFoundation here when https://bugs.webkit.org/show_bug.cgi?id=205085 lands
1313
INTERFACE_LINK_LIBRARIES "ICU::data;ICU::i18n;ICU::uc"
1414
)
15+
set(WTF_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/WTF")
1516
target_include_directories(WebKit::WTF INTERFACE
1617
${WTF_FRAMEWORK_HEADERS_DIR}
1718
)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.