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
+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
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 ()
+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.
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: $!";