From 75f32756ec8e53a0f254866c0d7120b078ce3b6e Mon Sep 17 00:00:00 2001 From: samelian Date: Mon, 21 Mar 2011 23:34:09 +0000 Subject: [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 --- kmail/CMakeLists.txt | 8 ++++++-- kmail/ConfigureChecks.cmake | 23 ----------------------- 2 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 kmail/ConfigureChecks.cmake (limited to 'kmail') 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 - struct s : public std::iterator {}; - 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( ) -- cgit v1.2.1