|
 |
1a42c4 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
1a42c4 |
index 7125773..8836e3f 100644
|
|
|
1a42c4 |
--- a/CMakeLists.txt
|
|
|
1a42c4 |
+++ b/CMakeLists.txt
|
|
|
1a42c4 |
@@ -12,7 +12,7 @@ option(KDEPIM_MOBILE_UI "Build UI for mobile devices instead of for desktops" FA
|
|
|
1a42c4 |
option(KDEPIM_ONLY_KLEO "Only build Kleopatra. This option will build only libkleo and kleopatra" FALSE)
|
|
|
1a42c4 |
option(KDEPIM_BUILD_STATIC "Build KDEPIM static." FALSE)
|
|
|
1a42c4 |
option(KDEPIM_BUILD_DESKTOP "Build Desktop Applications. Can be deactivated for mobile" TRUE)
|
|
|
1a42c4 |
-option(KDEPIM_NO_WEBKIT "Do not use WebKit in the kdepim applications" FALSE)
|
|
|
1a42c4 |
+option(KDEPIM_NO_WEBKIT "Do not use WebKit in the kdepim applications" TRUE)
|
|
|
1a42c4 |
|
|
|
1a42c4 |
if(KDEPIM_BUILD_STATIC)
|
|
|
1a42c4 |
set(LIBRARY_TYPE STATIC)
|
|
|
1a42c4 |
@@ -309,7 +309,6 @@ else()
|
|
|
1a42c4 |
# move to runtime this can be avoided
|
|
|
1a42c4 |
add_subdirectory(runtime)
|
|
|
1a42c4 |
endif()
|
|
|
1a42c4 |
- add_subdirectory(templateparser)
|
|
|
1a42c4 |
|
|
|
1a42c4 |
if(QGPGME_FOUND)
|
|
|
1a42c4 |
if(Boost_TOPOLOGICAL_SORT_DIR)
|
|
|
1a42c4 |
@@ -317,14 +316,10 @@ else()
|
|
|
1a42c4 |
endif()
|
|
|
1a42c4 |
endif()
|
|
|
1a42c4 |
|
|
|
1a42c4 |
- # The following components depend on QGpgME.
|
|
|
1a42c4 |
- set(MESSAGEVIEWER_SUPPORTED TRUE)
|
|
|
1a42c4 |
- add_subdirectory(messageviewer)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(messagecomposer)
|
|
|
1a42c4 |
add_subdirectory(pimcommon)
|
|
|
1a42c4 |
- add_subdirectory(mailcommon) # TODO: does this make sense?!?
|
|
|
1a42c4 |
- add_subdirectory(mailfilteragent)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(kmail)
|
|
|
1a42c4 |
+
|
|
|
1a42c4 |
+ # The following components depend on QGpgME.
|
|
|
1a42c4 |
+ set(MESSAGEVIEWER_SUPPORTED FALSE)
|
|
|
1a42c4 |
|
|
|
1a42c4 |
if(KDEPIM_BUILD_MOBILE)
|
|
|
1a42c4 |
add_subdirectory(mobile)
|
|
|
1a42c4 |
@@ -334,50 +329,24 @@ else()
|
|
|
1a42c4 |
add_subdirectory(examples)
|
|
|
1a42c4 |
endif()
|
|
|
1a42c4 |
|
|
|
1a42c4 |
- # If kmail is compiled, KMAIL_SUPPORTED is true (used in several places)
|
|
|
1a42c4 |
- if(BUILD_kmail)
|
|
|
1a42c4 |
- set(KMAIL_SUPPORTED TRUE)
|
|
|
1a42c4 |
- add_definitions(-DKMAIL_SUPPORTED)
|
|
|
1a42c4 |
- endif()
|
|
|
1a42c4 |
+ set(BUILD_kmail FALSE)
|
|
|
1a42c4 |
+ set(KMAIL_SUPPORTED FALSE)
|
|
|
1a42c4 |
+ set(BUILD_knode FALSE)
|
|
|
1a42c4 |
|
|
|
1a42c4 |
macro_optional_add_subdirectory(korganizer)
|
|
|
1a42c4 |
if(KDEPIM_BUILD_DESKTOP)
|
|
|
1a42c4 |
macro_optional_add_subdirectory(akregator)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(archivemailagent)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(importwizard)
|
|
|
1a42c4 |
macro_optional_add_subdirectory(kaddressbook)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(kmailcvt)
|
|
|
1a42c4 |
macro_optional_add_subdirectory(knotes)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(ksendemail)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(ktnef)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(mailimporter)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(pimsettingexporter)
|
|
|
1a42c4 |
macro_optional_add_subdirectory(kalarm)
|
|
|
1a42c4 |
-
|
|
|
1a42c4 |
- if(KDEPIMLIBS_KCAL_LIBRARY)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(blogilo)
|
|
|
1a42c4 |
- endif()
|
|
|
1a42c4 |
-
|
|
|
1a42c4 |
- if(Grantlee_FOUND)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(kjots)
|
|
|
1a42c4 |
- endif()
|
|
|
1a42c4 |
-
|
|
|
1a42c4 |
if(KDEPIMLIBS_KRESOURCES_LIBRARY)
|
|
|
1a42c4 |
- if(QT_QT3SUPPORT_FOUND)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(knode)
|
|
|
1a42c4 |
- endif()
|
|
|
1a42c4 |
-
|
|
|
1a42c4 |
if(Q_WS_X11)
|
|
|
1a42c4 |
macro_optional_add_subdirectory(ktimetracker)
|
|
|
1a42c4 |
endif()
|
|
|
1a42c4 |
-
|
|
|
1a42c4 |
endif()
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(kontact) # must be the last one.
|
|
|
1a42c4 |
endif()
|
|
|
1a42c4 |
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(akonadiconsole)
|
|
|
1a42c4 |
macro_optional_add_subdirectory(console)
|
|
|
1a42c4 |
- macro_optional_add_subdirectory(strigi-analyzer)
|
|
|
1a42c4 |
|
|
|
1a42c4 |
# These targets depend on optional applications
|
|
|
1a42c4 |
if(KDEPIMLIBS_KRESOURCES_LIBRARY)
|