Prepare internal AppleWin build for CMake

https://bugs.webkit.org/show_bug.cgi?id=149570

Reviewed by Brent Fulgham.

.:

* Source/PlatformWin.cmake:
Include internal CMake files if they exist.

WebKitLibraries:

* win/tools/scripts/auto-version.pl:
Use the WEBKIT_LIBRARIES environment variable if it exists.

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

diff --git a/ChangeLog b/ChangeLog
index d749b6df7e4d9f75e8bcecb62c4044f451ea5504..b68b9d46374b8da32c7f3c55eaa0d9f7b1f94966 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-09-25  Alex Christensen  <achristensen@webkit.org>
+
+        Prepare internal AppleWin build for CMake
+        https://bugs.webkit.org/show_bug.cgi?id=149570
+
+        Reviewed by Brent Fulgham.
+
+        * Source/PlatformWin.cmake:
+        Include internal CMake files if they exist.
+
 2015-09-22  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 
         Add a file of pointer-lock to cmake ports

diff --git a/Source/PlatformWin.cmake b/Source/PlatformWin.cmake
index 72d7e29832a2cd89555d52e7ca401018f8c405cd..38aef7f4d78cac3c8bb17e3cd6170e81041d179b 100644 (file)
--- a/Source/PlatformWin.cmake
+++ b/Source/PlatformWin.cmake
@@ -10,3 +10,8 @@ add_custom_target(
     DEPENDS JavaScriptCore WebCore
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
+
+if (EXISTS ${CMAKE_SOURCE_DIR}/../Internal/WebKit/WebKitSystemInterface/win/CMakeLists.txt)
+    add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/WebKit/WebKitSystemInterface/win ${CMAKE_CURRENT_BINARY_DIR}/WebKitSystemInterface)
+    add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/WebKit/WebKitQuartzCoreAdditions ${CMAKE_CURRENT_BINARY_DIR}/WebKitQuartzCoreAdditions)
+endif ()

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 4a45fb0b64b23e835b09d9ad7cfadb0f5497e02b..d16c3bdf71af09edf9fc3132d8270814f028d4d8 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+2015-09-25  Alex Christensen  <achristensen@webkit.org>
+
+        Prepare internal AppleWin build for CMake
+        https://bugs.webkit.org/show_bug.cgi?id=149570
+
+        Reviewed by Brent Fulgham.
+
+        * win/tools/scripts/auto-version.pl:
+        Use the WEBKIT_LIBRARIES environment variable if it exists.
+
 2015-09-25  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Unreviewed build fix.

diff --git a/WebKitLibraries/win/tools/scripts/auto-version.pl b/WebKitLibraries/win/tools/scripts/auto-version.pl
index 3c93f2688d76e6131be65ed2e2cb4b194b6536cf..a70cc86174a7870cf6d1358d9fcbc30b23fa86c8 100755 (executable)
--- a/WebKitLibraries/win/tools/scripts/auto-version.pl
+++ b/WebKitLibraries/win/tools/scripts/auto-version.pl
@@ -34,7 +34,13 @@ sub splitVersion($);
 
 die "You must supply an output path as the argument.\n" if ($#ARGV < 0);
 
-my $thisDirectory = dirname(abs_path($0));
+my $thisDirectory;
+my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
+if (defined $WEBKIT_LIBRARIES) {
+    $thisDirectory = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'scripts');
+} else {
+    $thisDirectory = dirname(abs_path($0));
+}
 
 my $FALLBACK_VERSION_PATH = File::Spec->catfile($thisDirectory, 'VERSION');
 open(FALLBACK_VERSION_FILE, '<', $FALLBACK_VERSION_PATH) or die "Unable to open $FALLBACK_VERSION_PATH: $!";