Title: [219335] trunk/Source/WebCore
Revision
219335
Author
[email protected]
Date
2017-07-11 09:43:04 -0700 (Tue, 11 Jul 2017)

Log Message

[Win] Build error when building WebCore from WebCore.proj project file.
https://bugs.webkit.org/show_bug.cgi?id=174330

Reviewed by Brent Fulgham.

Source/WebCore:

The CMake variable PAL_DIR should be set in the project file.

* WebCore.vcxproj/WebCore.proj:

Source/WebCore/PAL:

CMAKE_BINARY_DIR is needed in the include list in order to find 'cmakeconfig.h'.

* pal/CMakeLists.txt:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (219334 => 219335)


--- trunk/Source/WebCore/ChangeLog	2017-07-11 16:30:43 UTC (rev 219334)
+++ trunk/Source/WebCore/ChangeLog	2017-07-11 16:43:04 UTC (rev 219335)
@@ -1,3 +1,14 @@
+2017-07-11  Per Arne Vollan  <[email protected]>
+
+        [Win] Build error when building WebCore from WebCore.proj project file.
+        https://bugs.webkit.org/show_bug.cgi?id=174330
+
+        Reviewed by Brent Fulgham.
+
+        The CMake variable PAL_DIR should be set in the project file.
+
+        * WebCore.vcxproj/WebCore.proj:
+
 2017-05-24  Sergio Villar Senin  <[email protected]>
 
         [SVG] Leak in SVGAnimatedListPropertyTearOff

Modified: trunk/Source/WebCore/PAL/ChangeLog (219334 => 219335)


--- trunk/Source/WebCore/PAL/ChangeLog	2017-07-11 16:30:43 UTC (rev 219334)
+++ trunk/Source/WebCore/PAL/ChangeLog	2017-07-11 16:43:04 UTC (rev 219335)
@@ -1,3 +1,14 @@
+2017-07-11  Per Arne Vollan  <[email protected]>
+
+        [Win] Build error when building WebCore from WebCore.proj project file.
+        https://bugs.webkit.org/show_bug.cgi?id=174330
+
+        Reviewed by Brent Fulgham.
+
+        CMAKE_BINARY_DIR is needed in the include list in order to find 'cmakeconfig.h'. 
+
+        * pal/CMakeLists.txt:
+
 2017-07-03  Brian Burg  <[email protected]>
 
         Web Replay: remove some unused code

Modified: trunk/Source/WebCore/PAL/pal/CMakeLists.txt (219334 => 219335)


--- trunk/Source/WebCore/PAL/pal/CMakeLists.txt	2017-07-11 16:30:43 UTC (rev 219334)
+++ trunk/Source/WebCore/PAL/pal/CMakeLists.txt	2017-07-11 16:43:04 UTC (rev 219335)
@@ -2,6 +2,7 @@
 )
 
 set(PAL_INCLUDE_DIRECTORIES
+    "${CMAKE_BINARY_DIR}"
     "${PAL_DIR}"
 )
 

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (219334 => 219335)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj	2017-07-11 16:30:43 UTC (rev 219334)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj	2017-07-11 16:43:04 UTC (rev 219335)
@@ -28,7 +28,7 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-	<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) -DWEBCORE_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) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/')) -DPAL_DIR=$(SRCROOT.Replace('\','/'))/PAL</CMakeCommandCommon>
   </PropertyGroup>
  
   <!-- Prepare for build -->
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to