summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-03-21 23:34:09 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-03-21 23:34:09 +0000
commit75f32756ec8e53a0f254866c0d7120b078ce3b6e (patch)
tree8ce60911389d282ef783a29d067aba67cfd50d3d /kmail
parent760bf34acbfebc8f7d2c569238138173c103f0db (diff)
downloadtdepim-75f32756ec8e53a0f254866c0d7120b078ce3b6e.tar.gz
tdepim-75f32756ec8e53a0f254866c0d7120b078ce3b6e.zip
[kdepim] indexlib ported to cmake; added indexlib (optional) support to kmail
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1225601 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail')
-rw-r--r--kmail/CMakeLists.txt8
-rw-r--r--kmail/ConfigureChecks.cmake23
2 files changed, 6 insertions, 25 deletions
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index a9a198a6a..21ba5e16f 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -11,7 +11,11 @@
project( kmail )
-include( ConfigureChecks.cmake )
+if( WITH_INDEXLIB )
+ tde_import( indexlib )
+ add_definitions( -DHAVE_INDEXLIB )
+ set( INDEX_LIBRARY index-shared )
+endif( )
tde_import( libkdenetwork )
tde_import( certmanager )
@@ -187,7 +191,7 @@ tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
LINK
emailfunctions-static kmime-shared kpgp-shared kdepim-shared kpimidentities-shared
- mimelib-shared ksieve-shared khtml-shared
+ mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kmail/ConfigureChecks.cmake b/kmail/ConfigureChecks.cmake
deleted file mode 100644
index dbda06e3f..000000000
--- a/kmail/ConfigureChecks.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-# check for stl coping with namespace std
-tde_save( CMAKE_CXX_FLAGS )
-string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
-check_cxx_source_compiles("
- #include <iterator>
- struct s : public std::iterator<std::forward_iterator_tag, int> {};
- int main(int, char**) { return 0; } "
- HAVE_STLNAMESPACE )
-tde_restore( CMAKE_CXX_FLAGS )
-if( HAVE_STLNAMESPACE )
- set( STD_NAMESPACE_PREFIX "std::" CACHE INTERNAL "" FORCE )
-endif( )