diff options
| author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-03-29 18:38:35 +0000 |
|---|---|---|
| committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-03-29 18:38:35 +0000 |
| commit | 863fa233a00b0b0e6755a7e56396156cd0e7d55e (patch) | |
| tree | b4a44e3dbab7b4cdb4b82c664add39d91da8d45b | |
| parent | 466b6076670486cfebc16cbaff369f4270d4095f (diff) | |
| download | libproxy-863fa233a00b0b0e6755a7e56396156cd0e7d55e.tar.gz | |
Build: Add option to link against libwebkit-gtk3.
CMake option "WITH_WEBKIT3"
git-svn-id: http://libproxy.googlecode.com/svn/trunk@793 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libproxy/cmake/modules/pacrunner_webkit.cmk | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45e4dfb..5313787 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,8 @@ include(cmake/cpack.cmk) include(cmake/ctest.cmk) include(cmake/paths.cmk) +option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) + ### Subdirectories # Conditionally build bundled libmodman option(FORCE_SYSTEM_LIBMODMAN "Force using system libmodman" OFF) diff --git a/libproxy/cmake/modules/pacrunner_webkit.cmk b/libproxy/cmake/modules/pacrunner_webkit.cmk index e5f485e..7b29c4a 100644 --- a/libproxy/cmake/modules/pacrunner_webkit.cmk +++ b/libproxy/cmake/modules/pacrunner_webkit.cmk @@ -12,5 +12,9 @@ elseif(APPLE) set(WEBKIT_FOUND 1) endif() else() - px_check_modules(WEBKIT webkit-1.0) -endif()
\ No newline at end of file + if(WITH_WEBKIT3) + px_check_modules(WEBKIT webkitgtk-3.0) + else() + px_check_modules(WEBKIT webkit-1.0) + endif() +endif() |