Title: [190251] trunk
- Revision
- 190251
- Author
- [email protected]
- Date
- 2015-09-25 14:30:05 -0700 (Fri, 25 Sep 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/ChangeLog (190250 => 190251)
--- trunk/ChangeLog 2015-09-25 19:46:51 UTC (rev 190250)
+++ trunk/ChangeLog 2015-09-25 21:30:05 UTC (rev 190251)
@@ -1,3 +1,13 @@
+2015-09-25 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Add a file of pointer-lock to cmake ports
Modified: trunk/Source/PlatformWin.cmake (190250 => 190251)
--- trunk/Source/PlatformWin.cmake 2015-09-25 19:46:51 UTC (rev 190250)
+++ trunk/Source/PlatformWin.cmake 2015-09-25 21:30:05 UTC (rev 190251)
@@ -10,3 +10,8 @@
DEPENDS _javascript_Core 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 ()
Modified: trunk/WebKitLibraries/ChangeLog (190250 => 190251)
--- trunk/WebKitLibraries/ChangeLog 2015-09-25 19:46:51 UTC (rev 190250)
+++ trunk/WebKitLibraries/ChangeLog 2015-09-25 21:30:05 UTC (rev 190251)
@@ -1,3 +1,13 @@
+2015-09-25 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[Win] Unreviewed build fix.
Modified: trunk/WebKitLibraries/win/tools/scripts/auto-version.pl (190250 => 190251)
--- trunk/WebKitLibraries/win/tools/scripts/auto-version.pl 2015-09-25 19:46:51 UTC (rev 190250)
+++ trunk/WebKitLibraries/win/tools/scripts/auto-version.pl 2015-09-25 21:30:05 UTC (rev 190251)
@@ -34,7 +34,13 @@
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: $!";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
