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.

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

diff --git a/ChangeLog b/ChangeLog
index be4e582af8a3a38fa46376d9867b97dfdc082069..cb739334f4a73c5065e892b2c42d2fe0261629c8 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

diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
index 11f94b01a5fbc5e2e7a40da54de8b1afd6cfa3f8..3ccc7fe3126e10469e315ccdbb4692236099b583 100644 (file)
--- a/Source/cmake/OptionsWin.cmake
+++ b/Source/cmake/OptionsWin.cmake
@@ -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")