diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-23 03:11:26 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-23 03:11:26 +0100 |
| commit | df7a2820a54d8b69e87b495269b88f9ae5ac156d (patch) | |
| tree | 4124db211bddf2dbf784d0eddbf70bbb8c24ee0f /src/CMakeLists.txt | |
| parent | Fixing urlbar size (diff) | |
| parent | Saving 4 bytes per tab :) (diff) | |
| download | rekonq-df7a2820a54d8b69e87b495269b88f9ae5ac156d.tar.xz | |
Merge branch 'devAdBlock'
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 296e91fd..1061f3e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,7 @@ ADD_SUBDIRECTORY( data ) ADD_SUBDIRECTORY( tests ) +ADD_SUBDIRECTORY( adblock ) ### ------- SETTING REKONQ FILES.. @@ -27,11 +28,17 @@ SET( rekonq_KDEINIT_SRCS webpluginfactory.cpp websnap.cpp webview.cpp +#---------------------------------------- rekonqpage/newtabpage.cpp +#---------------------------------------- settings/settingsdialog.cpp - bookmarkspanel/bookmarkspanel.cpp - bookmarkspanel/bookmarkstreemodel.cpp - bookmarkspanel/bookmarksproxy.cpp +#---------------------------------------- + bookmarkspanel/bookmarkspanel.cpp + bookmarkspanel/bookmarkstreemodel.cpp + bookmarkspanel/bookmarksproxy.cpp +#---------------------------------------- + adblock/adblockmanager.cpp + adblock/adblockrule.cpp ) @@ -51,6 +58,7 @@ KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc ) INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/rekonqpage ${CMAKE_CURRENT_SOURCE_DIR}/settings + ${CMAKE_CURRENT_SOURCE_DIR}/adblock ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES} |