[Win CMake] Allow WebKitLibraries directory to be set from the command line
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Aug 2015 00:43:55 +0000 (00:43 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Aug 2015 00:43:55 +0000 (00:43 +0000)
commit2e1062fd0a4e3bb16db63228fdace40c77b441d5
tree57a4095d704e16fa1fdd3b5fb08f0b1e1de4c74f
parent37118a2ae9987bfd6a9840c8cabe6910192fb54d
[Win CMake] Allow WebKitLibraries directory to be set from the command line
https://bugs.webkit.org/show_bug.cgi?id=148112

Reviewed by Brent Fulgham.

.:

* Source/cmake/OptionsWin.cmake:
Don't use an environment variable for WEBKIT_LIBRARIES_DIR.
Instead, use the default location if nothing is passed in from the command line.
This way we can set it from the command line for the AppleInternal build.
Also, set the output directories to be consistent between the old and new build systems (and ninja).

Source/WebCore:

* PlatformAppleWin.cmake:
* PlatformWinCairo.cmake:
Don't use an environment variable for WEBKIT_LIBRARIES_DIR.

Source/WebKit:

* PlatformWin.cmake:
Don't use an environment variable for WEBKIT_LIBRARIES_DIR.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188560 268f45cc-cd09-0410-ab3c-d52691b4dbfc
ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/PlatformAppleWin.cmake
Source/WebCore/PlatformWinCairo.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformWin.cmake
Source/cmake/OptionsWin.cmake