Fix Windows EWS build after r189934.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Sep 2015 21:48:55 +0000 (21:48 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Sep 2015 21:48:55 +0000 (21:48 +0000)
* Source/cmake/OptionsWin.cmake:
Use WEBKIT_LIBRARIES environment variable if it exists.
We have the WebKitLibraries directory separate from the repository copy on the EWS bots.

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

ChangeLog
Source/cmake/OptionsWin.cmake

index be4e582..cb73933 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-09-17  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Windows EWS build after r189934.
+
+        * Source/cmake/OptionsWin.cmake:
+        Use WEBKIT_LIBRARIES environment variable if it exists.
+        We have the WebKitLibraries directory separate from the repository copy on the EWS bots.
+
 2015-09-15  Ryosuke Niwa  <rniwa@webkit.org>
 
         Add ShadowRoot interface and Element.prototype.attachShadow
index 11f94b0..3ccc7fe 100644 (file)
@@ -108,7 +108,11 @@ endif ()
 WEBKIT_OPTION_END()
 
 if (NOT WEBKIT_LIBRARIES_DIR)
-    set(WEBKIT_LIBRARIES_DIR "${CMAKE_SOURCE_DIR}/WebKitLibraries/win")
+    if (DEFINED ENV{WEBKIT_LIBRARIES})
+        set(WEBKIT_LIBRARIES_DIR "$ENV{WEBKIT_LIBRARIES}")
+    else ()
+        set(WEBKIT_LIBRARIES_DIR "${CMAKE_SOURCE_DIR}/WebKitLibraries/win")
+    endif ()
 endif ()
 
 include_directories("${WEBKIT_LIBRARIES_DIR}/include")