diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
tree | e367e64a75991c554930278175d403c072de6bb8 /Tools/CMakeLists.txt | |
parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Tools/CMakeLists.txt')
-rw-r--r-- | Tools/CMakeLists.txt | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt index 1aa39bf82..5ce79a9fc 100644 --- a/Tools/CMakeLists.txt +++ b/Tools/CMakeLists.txt @@ -1,23 +1,28 @@ -IF (ENABLE_WEBKIT2) - ADD_SUBDIRECTORY(WebKitTestRunner) -ENDIF () +if (ENABLE_WEBKIT2 AND NOT("${PORT}" STREQUAL "GTK")) + add_subdirectory(WebKitTestRunner) +endif () -IF ("${PORT}" STREQUAL "Efl") - ADD_SUBDIRECTORY(EWebLauncher/ControlTheme) +if ("${PORT}" STREQUAL "Efl") + add_subdirectory(ImageDiff) + add_subdirectory(EWebLauncher/ControlTheme) - IF (ENABLE_WEBKIT) - ADD_SUBDIRECTORY(DumpRenderTree/efl) - ADD_SUBDIRECTORY(EWebLauncher) - ENDIF () + if (ENABLE_WEBKIT) + add_subdirectory(DumpRenderTree/efl) + add_subdirectory(EWebLauncher) + endif () - IF (ENABLE_WEBKIT2 AND ELEMENTARY_FOUND) - ADD_SUBDIRECTORY(MiniBrowser/efl) - ENDIF () - ADD_SUBDIRECTORY(DumpRenderTree/TestNetscapePlugIn) -ELSEIF ("${PORT}" STREQUAL "WinCE") - ADD_SUBDIRECTORY(WinCELauncher) -ENDIF() + if (ENABLE_WEBKIT2) + add_subdirectory(MiniBrowser/efl) + endif () + add_subdirectory(DumpRenderTree/TestNetscapePlugIn) +elseif ("${PORT}" STREQUAL "GTK") + if (ENABLE_WEBKIT2) + add_subdirectory(MiniBrowser/gtk) + endif () +elseif ("${PORT}" STREQUAL "WinCE") + add_subdirectory(WinCELauncher) +endif () -IF (ENABLE_WEBKIT2 AND ENABLE_API_TESTS) - ADD_SUBDIRECTORY(TestWebKitAPI) -ENDIF() +if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS) + add_subdirectory(TestWebKitAPI) +endif () |