Changeset 248304 in webkit

Timestamp:

Aug 6, 2019 10:37:39 AM (5 years ago)

Author:

pvollan@apple.com

Message:

[Win] Fix AppleWin build
​https://bugs.webkit.org/show_bug.cgi?id=200455

Reviewed by Alex Christensen.

• CMakeLists.txt:

Source/JavaScriptCore:

• shell/CMakeLists.txt:

Source/WebKitLegacy:

• PlatformWin.cmake:
• WebKitLegacy.vcxproj/WebKitLegacy.proj:

Location:

trunk/Source

Files:

• JavaScriptCore/CMakeLists.txt (modified) (1 diff)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/shell/CMakeLists.txt (modified) (1 diff)
• WebKitLegacy/CMakeLists.txt (modified) (1 diff)
• WebKitLegacy/ChangeLog (modified) (1 diff)
• WebKitLegacy/PlatformWin.cmake (modified) (1 diff)
• WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (modified) (1 diff)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -1308 +1308 @@
 # eliminate duplicated custom commands. Otherwise,
 # CombinedDomains.json will be generated in both projects.
-add_dependencies(JavaScriptCore_CopyPrivateHeaders JavaScriptCore)
+if (NOT INTERNAL_BUILD)
+    add_dependencies(JavaScriptCore_CopyPrivateHeaders JavaScriptCore)
+endif ()
 
 target_include_directories(LLIntSettingsExtractor PRIVATE

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-06  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Fix AppleWin build
+        https://bugs.webkit.org/show_bug.cgi?id=200455
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+        * shell/CMakeLists.txt:
+
 2019-08-05  Devin Rousso  <drousso@apple.com>
 

trunk/Source/JavaScriptCore/shell/CMakeLists.txt

@@ -20 +20 @@
 if (WTF_OS_MAC_OS_X)
     list(APPEND jsc_LIBRARIES edit)
+endif ()
+
+if (WIN32)
+    list(APPEND jsc_LIBRARIES Winmm)
 endif ()
 

trunk/Source/WebKitLegacy/CMakeLists.txt

@@ -43 +43 @@
 WEBKIT_FRAMEWORK(WebKitLegacy)
 
-add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
+if (NOT INTERNAL_BUILD)
+    add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
+endif ()
 if (TARGET WebKitLegacyGUID)
     add_dependencies(WebKitLegacy WebKitLegacyGUID)

trunk/Source/WebKitLegacy/ChangeLog

@@ +1 @@
+2019-08-06  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Fix AppleWin build
+        https://bugs.webkit.org/show_bug.cgi?id=200455
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+        * PlatformWin.cmake:
+        * WebKitLegacy.vcxproj/WebKitLegacy.proj:
+
 2019-07-31  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKitLegacy/PlatformWin.cmake

@@ -487 +487 @@
     FLATTENED
 )
-add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
+if (NOT INTERNAL_BUILD)
+    add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
+endif ()
 
 set(WebKitLegacy_OUTPUT_NAME

trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj

@@ -29 +29 @@
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-        <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -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>
+        <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>
   </PropertyGroup>