[Win] Build error when building WebCore from WebCore.proj project file.
authorpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Jul 2017 16:43:04 +0000 (16:43 +0000)
committerpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Jul 2017 16:43:04 +0000 (16:43 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219335 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/CMakeLists.txt
Source/WebCore/WebCore.vcxproj/WebCore.proj

index 9fa28cd..1d24b36 100644 (file)
@@ -1,3 +1,14 @@
+2017-07-11  Per Arne Vollan  <pvollan@apple.com>
+
+        [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  <svillar@igalia.com>
 
         [SVG] Leak in SVGAnimatedListPropertyTearOff
index 85ae311..ee20eb1 100644 (file)
@@ -1,3 +1,14 @@
+2017-07-11  Per Arne Vollan  <pvollan@apple.com>
+
+        [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  <bburg@apple.com>
 
         Web Replay: remove some unused code
index 420438d..290382c 100644 (file)
@@ -2,6 +2,7 @@ set(PAL_SOURCES
 )
 
 set(PAL_INCLUDE_DIRECTORIES
+    "${CMAKE_BINARY_DIR}"
     "${PAL_DIR}"
 )
 
index 32ad535..27569d7 100644 (file)
@@ -28,7 +28,7 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>\r
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  \r
     <OutputDirectory>$(DSTROOT)</OutputDirectory>\r
-       <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>\r
+       <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>\r
   </PropertyGroup>\r
  \r
   <!-- Prepare for build -->\r