diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-22 08:08:05 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:16 +0000 |
| commit | 1c8f056531c65706b85c44c2db657ea891be868d (patch) | |
| tree | 29c2cd2bf06230e9e76945990ef9c0e70cfb483e /Source/cmake | |
| parent | 8f2cfe80a5fb6632b4bbb9181db28f0505058128 (diff) | |
| download | qtwebkit-1c8f056531c65706b85c44c2db657ea891be868d.tar.gz | |
Imported WebKit commit a16099e901e36e6d298dd30c0694a2130052d70e
Change-Id: I484731400983d1d964bdcf4afc4007f41ca1bb8a
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/cmake')
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 2 | ||||
| -rw-r--r-- | Source/cmake/WebKitFeatures.cmake | 2 | ||||
| -rw-r--r-- | Source/cmake/WebKitMacros.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index 68d95e1e5..378158615 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -319,7 +319,7 @@ list(APPEND QT_REQUIRED_COMPONENTS ) set(QT_OPTIONAL_COMPONENTS OpenGL) -if (ENABLE_TEST_SUPPORT) +if (ENABLE_API_TESTS OR ENABLE_TEST_SUPPORT) list(APPEND QT_REQUIRED_COMPONENTS Test ) diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake index fe680b181..b52084f48 100644 --- a/Source/cmake/WebKitFeatures.cmake +++ b/Source/cmake/WebKitFeatures.cmake @@ -269,7 +269,7 @@ macro(WEBKIT_OPTION_END) endif () option(${_name} "${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}}" ${_WEBKIT_AVAILABLE_OPTIONS_INITIAL_VALUE_${_name}}) - if (NOT _WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name}) + if (NOT ${_WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name}}) mark_as_advanced(FORCE ${_name}) endif () endforeach () diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake index d7baa6b81..8879ec75a 100644 --- a/Source/cmake/WebKitMacros.cmake +++ b/Source/cmake/WebKitMacros.cmake @@ -364,7 +364,7 @@ endmacro() macro(MAKE_JS_FILE_ARRAYS _output_cpp _output_h _scripts _scripts_dependencies) if (WIN32) - set(_python_path set "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}" COMMAND) + set(_python_path set "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}" &&) else () set(_python_path "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}") endif () |