Steps towards CMake on Windows.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jul 2014 18:45:16 +0000 (18:45 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jul 2014 18:45:16 +0000 (18:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=134716

Patch by Alex Christensen <achristensen@webkit.org> on 2014-07-08
Reviewed by Martin Robinson.

* CMakeLists.txt:
Added AppleWin and WinCairo to list of CMake ports.
* Source/cmake/OptionsAppleWin.cmake: Added.
* Source/cmake/OptionsWinCairo.cmake: Added.
* Source/cmake/OptionsWindows.cmake:
Windows needs to use the system malloc.  Other options to come.

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

CMakeLists.txt
ChangeLog
Source/cmake/OptionsAppleWin.cmake [new file with mode: 0644]
Source/cmake/OptionsWinCairo.cmake [new file with mode: 0644]
Source/cmake/OptionsWindows.cmake

index b82a6da..f6ca54a 100644 (file)
@@ -41,7 +41,7 @@ include(WebKitFeatures)
 # -----------------------------------------------------------------------------
 # Determine which port will be built
 # -----------------------------------------------------------------------------
-set(ALL_PORTS Efl WinCE GTK)
+set(ALL_PORTS Efl WinCE GTK AppleWin WinCairo)
 set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
 
 list(FIND ALL_PORTS ${PORT} RET)
index 9ffe725..4222f67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2014-07-08  Alex Christensen  <achristensen@webkit.org>
+
+        Steps towards CMake on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=134716
+
+        Reviewed by Martin Robinson.
+
+        * CMakeLists.txt:
+        Added AppleWin and WinCairo to list of CMake ports.
+        * Source/cmake/OptionsAppleWin.cmake: Added.
+        * Source/cmake/OptionsWinCairo.cmake: Added.
+        * Source/cmake/OptionsWindows.cmake:
+        Windows needs to use the system malloc.  Other options to come.
+
 2014-07-04  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [EFL] Support Geolocation
diff --git a/Source/cmake/OptionsAppleWin.cmake b/Source/cmake/OptionsAppleWin.cmake
new file mode 100644 (file)
index 0000000..c45b5d0
--- /dev/null
@@ -0,0 +1,3 @@
+include(OptionsWindows)
+
+set(PORT_FALLBACK Win)
diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
new file mode 100644 (file)
index 0000000..c45b5d0
--- /dev/null
@@ -0,0 +1,3 @@
+include(OptionsWindows)
+
+set(PORT_FALLBACK Win)
index e106126..023f36c 100644 (file)
@@ -1,5 +1,9 @@
 add_definitions(-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DUNICODE)
 
+WEBKIT_OPTION_BEGIN()
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC ON)
+WEBKIT_OPTION_END()
+
 if (MSVC)
     add_definitions(/WX
         /wd4018 /wd4065 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4275 /wd4288 /wd4291