From: don.olmstead@sony.com Date: Thu, 21 Dec 2017 03:39:49 +0000 (+0000) Subject: [CMake][Win] Add a way to set CMAKE_IGNORE_PATH X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=623687bd4007868afa9196a48e87533cab33edf3 [CMake][Win] Add a way to set CMAKE_IGNORE_PATH https://bugs.webkit.org/show_bug.cgi?id=181056 Reviewed by Konstantin Tokarev. * Source/cmake/OptionsWin.cmake: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226212 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/ChangeLog b/ChangeLog index 27ca290..ade0cc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2017-12-20 Don Olmstead + + [CMake][Win] Add a way to set CMAKE_IGNORE_PATH + https://bugs.webkit.org/show_bug.cgi?id=181056 + + Reviewed by Konstantin Tokarev. + + * Source/cmake/OptionsWin.cmake: + 2017-12-20 Daniel Bates Remove Alternative Presentation Button diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake index 1d283c6..91b87c8 100644 --- a/Source/cmake/OptionsWin.cmake +++ b/Source/cmake/OptionsWin.cmake @@ -90,6 +90,10 @@ endif () WEBKIT_OPTION_END() +if (DEFINED ENV{WEBKIT_IGNORE_PATH}) + set(CMAKE_IGNORE_PATH $ENV{WEBKIT_IGNORE_PATH}) +endif () + if (NOT WEBKIT_LIBRARIES_DIR) if (DEFINED ENV{WEBKIT_LIBRARIES}) set(WEBKIT_LIBRARIES_DIR "$ENV{WEBKIT_LIBRARIES}")