[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/pim/mailody
From:       Tom Albers <tomalbers () kde ! nl>
Date:       2008-03-21 11:15:51
Message-ID: 1206098151.926717.15380.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 788320 by toma:

Remove local copy of akonadi


 _M            . (directory)  
 M  +1 -44     CMakeLists.txt  


** trunk/playground/pim/mailody #property svn:externals
   - akonadi svn://anonsvn.kde.org/home/kde/trunk/KDE/kdepim/akonadi
maildir svn://anonsvn.kde.org/home/kde/trunk/KDE/kdepim/maildir
--- trunk/playground/pim/mailody/CMakeLists.txt #788319:788320
@@ -8,50 +8,8 @@
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=50002) 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-include_directories ( ${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
-${CMAKE_SOURCE_DIR}/libkdepim/ 
-${CMAKE_CURRENT_DIR}akonadi/ ${CMAKE_CURRENT_DIR}akonadi/libakonadi/
-${CMAKE_CURRENT_BINARY_DIR}/akonadi/ ${CMAKE_CURRENT_SOURCE_DIR}
-${CMAKE_CURRENT_SOURCE_DIR}/libkdepim/ ${CMAKE_CURRENT_SOURCE_DIR}/maildir/
-)
+include_directories ( ${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
 
-#------------------------------ akonadi stufff
-
-# this macro exists to work around a stupid Mac OS X linker bug
-# where it can't handle the same library being referenced multiple
-# times on the linker line
-macro (KDEPIM4_LINK_UNIQUE_LIBRARIES)
-        SET(LINK_ARG_LIST)
-        FOREACH(arg ${ARGN})
-                SET(LINK_ARG_FOUND FALSE)
-                FOREACH(existing ${LINK_ARG_LIST})
-                        IF(${arg} STREQUAL ${existing})
-                                SET(LINK_ARG_FOUND)
-                        ENDIF(${arg} STREQUAL ${existing})
-                ENDFOREACH(existing)
-
-                IF(NOT ${LINK_ARG_FOUND})
-                        LIST(APPEND LINK_ARG_LIST ${arg})
-                ENDIF(NOT ${LINK_ARG_FOUND})
-        ENDFOREACH(arg)
-
-        TARGET_LINK_LIBRARIES(${LINK_ARG_LIST})
-endmacro (KDEPIM4_LINK_UNIQUE_LIBRARIES)
-
-find_package(Boost REQUIRED )
-macro_log_feature(Boost_FOUND "boost" "Boost C++ Libraries" "http://www.boost.org/" \
                TRUE "" "Required by Mailody")
-
-macro_optional_find_package(MySQL)
-macro_log_feature(MYSQL_EMBEDDED_FOUND "mysql-embedded" "MySQL/Embedded Library" \
"http://www.mysql.org" FALSE "" "Needed for the MySQL/Embedded Akonadi backend. \
                Sqlite will be used instead.")
-
-macro_optional_find_package(LibXslt)
-macro_log_feature(XSLTPROC_EXECUTABLE "xsltproc" "xsltproc" \
                "http://xmlsoft.org/XSLT/" FALSE "" "Needed to generate Akonadi \
                database code")
-
-ADD_SUBDIRECTORY( libkdepim )
-ADD_SUBDIRECTORY( maildir )
-ADD_SUBDIRECTORY( akonadi )
-
-#------------------------------------- end akonadi stuff
 add_subdirectory(cmake)
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
@@ -67,7 +25,6 @@
 endif (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
 configure_file(src/config-mailody.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-mailody.h )  
-ADD_SUBDIRECTORY( akonadi_resource )
 ADD_SUBDIRECTORY( src ) 
 ADD_SUBDIRECTORY( icons ) 
 


[prev in list] [next in list] [prev in thread] [next in thread]