Changeset 248304 in webkit
- Timestamp:
- Aug 6, 2019 10:37:39 AM (5 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/CMakeLists.txt
r248187 r248304 1308 1308 # eliminate duplicated custom commands. Otherwise, 1309 1309 # CombinedDomains.json will be generated in both projects. 1310 add_dependencies(JavaScriptCore_CopyPrivateHeaders JavaScriptCore) 1310 if (NOT INTERNAL_BUILD) 1311 add_dependencies(JavaScriptCore_CopyPrivateHeaders JavaScriptCore) 1312 endif () 1311 1313 1312 1314 target_include_directories(LLIntSettingsExtractor PRIVATE -
trunk/Source/JavaScriptCore/ChangeLog
r248289 r248304 1 2019-08-06 Per Arne Vollan <pvollan@apple.com> 2 3 [Win] Fix AppleWin build 4 https://bugs.webkit.org/show_bug.cgi?id=200455 5 6 Reviewed by Alex Christensen. 7 8 * CMakeLists.txt: 9 * shell/CMakeLists.txt: 10 1 11 2019-08-05 Devin Rousso <drousso@apple.com> 2 12 -
trunk/Source/JavaScriptCore/shell/CMakeLists.txt
r248087 r248304 20 20 if (WTF_OS_MAC_OS_X) 21 21 list(APPEND jsc_LIBRARIES edit) 22 endif () 23 24 if (WIN32) 25 list(APPEND jsc_LIBRARIES Winmm) 22 26 endif () 23 27 -
trunk/Source/WebKitLegacy/CMakeLists.txt
r246874 r248304 43 43 WEBKIT_FRAMEWORK(WebKitLegacy) 44 44 45 add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders) 45 if (NOT INTERNAL_BUILD) 46 add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders) 47 endif () 46 48 if (TARGET WebKitLegacyGUID) 47 49 add_dependencies(WebKitLegacy WebKitLegacyGUID) -
trunk/Source/WebKitLegacy/ChangeLog
r248051 r248304 1 2019-08-06 Per Arne Vollan <pvollan@apple.com> 2 3 [Win] Fix AppleWin build 4 https://bugs.webkit.org/show_bug.cgi?id=200455 5 6 Reviewed by Alex Christensen. 7 8 * CMakeLists.txt: 9 * PlatformWin.cmake: 10 * WebKitLegacy.vcxproj/WebKitLegacy.proj: 11 1 12 2019-07-31 Keith Rollin <krollin@apple.com> 2 13 -
trunk/Source/WebKitLegacy/PlatformWin.cmake
r245968 r248304 487 487 FLATTENED 488 488 ) 489 add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders) 489 if (NOT INTERNAL_BUILD) 490 add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders) 491 endif () 490 492 491 493 set(WebKitLegacy_OUTPUT_NAME -
trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj
r225563 r248304 29 29 <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir> 30 30 <OutputDirectory>$(DSTROOT)</OutputDirectory> 31 <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -D WEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>31 <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon> 32 32 </PropertyGroup> 33 33
Note: See TracChangeset
for help on using the changeset viewer.