[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim
From: Allen Winter <winter () kde ! org>
Date: 2007-07-01 17:27:09
Message-ID: 1183310829.288645.846.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 682120 by winterz:
gpgmepp and qgpgme have been moved into kdepimlibs
M +0 -6 CMakeLists.txt
M +0 -1 MAINTAINERS
M +0 -6 Mainpage.dox
M +0 -7 dependency-graph.dot
D gpgmepp (directory)
M +1 -2 kaddressbook/editors/CMakeLists.txt
M +2 -2 kaddressbook/xxport/CMakeLists.txt
M +0 -1 kalarm/CMakeLists.txt
M +3 -3 kleopatra/CMakeLists.txt
M +1 -1 kmail/CMakeLists.txt
M +0 -1 kontact/plugins/summary/CMakeLists.txt
M +0 -1 korganizer/CMakeLists.txt
M +2 -2 libkleo/CMakeLists.txt
D qgpgme (directory)
--- trunk/KDE/kdepim/CMakeLists.txt #682119:682120
@@ -52,7 +52,6 @@
include (ConfigureChecks.cmake)
-include (gpgmepp/ConfigureChecks.cmake)
configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@@ -108,10 +107,6 @@
macro_optional_add_subdirectory(akregator)
macro_optional_add_subdirectory(doc)
-if(GPGME_FOUND)
- add_subdirectory(gpgmepp)
-endif(GPGME_FOUND)
-
if(OPENSYNC_FOUND AND OSENGINE_FOUND)
macro_optional_add_subdirectory(kitchensync)
endif(OPENSYNC_FOUND AND OSENGINE_FOUND)
@@ -151,7 +146,6 @@
if(GPGME_FOUND)
add_subdirectory(plugins)
- add_subdirectory(qgpgme)
add_subdirectory(wizards)
endif(GPGME_FOUND)
--- trunk/KDE/kdepim/MAINTAINERS #682119:682120
@@ -1,6 +1,5 @@
akonadiserver ?
akregator Frank Osterfeld <frank.osterfeld@kdemail.net>
-gpgmepp Marc Mutz <mutz@kde.org>
kabcclient Kevin Krammer <kevin.krammer@gmx.at>
kaddressbook Tobias Koenig <tokoe@kde.org>
Cornelius Schumacher <schumacher@kde.org>
--- trunk/KDE/kdepim/Mainpage.dox #682119:682120
@@ -65,12 +65,6 @@
* - <a href="libkleo/html/index.html"><b>libkleo</b></a>
* (<a href="libkleo/html/classes.html">classes</a>)\n
* <i>A library for encryption handling.</i>
- * - <a href="gpgmepp/html/index.html"><b>GpgME++</b></a>
- * (<a href="gpgmepp/html/classes.html">classes</a>)\n
- * <i>A C++ wrapper for gpgme.</i>
- * - <a href="qgpgme/html/index.html"><b>QGpgME</b></a>
- * (<a href="qgpgme/html/classes.html">classes</a>)\n
- * <i>Qt eventloop integration for gpgme.</i>
* - <a href="libkpgp/html/index.html"><b>libkpgp</b></a>
* (<a href="libkpgp/html/classes.html">classes</a>)\n
* <i>A PGP abstraction layer.</i>
--- trunk/KDE/kdepim/dependency-graph.dot #682119:682120
@@ -32,7 +32,6 @@
/* kdepim */
"akonadiserver"[style=filled, fillcolor=lightcyan, \
URL="akonadi/akonadiserver/html/index.html"];
"akregator"[style=filled, fillcolor=lightcyan, \
URL="akregator/html/index.html"];
- "gpgmepp"[style=filled, fillcolor=lightyellow, \
URL="gpgmepp/html/index.html"]; /* kabc ?? */
"kaddressbook"[style=filled, fillcolor=lightcyan, \
URL="kaddressbook/html/index.html"];
"kalarm"[style=filled, fillcolor=lightcyan, URL="kalarm/html/index.html"];
@@ -62,7 +61,6 @@
"mimelib"[style=filled, fillcolor=lightyellow];
"networkstatus"[style=filled, fillcolor=palegreen];
"plugins"[style=filled, fillcolor=palegreen];
- "qgpgme"[style=filled, fillcolor=lightyellow, URL="qgpgme/html/index.html"];
"wizards"[style=filled, fillcolor=lightcyan];
/*
@@ -103,11 +101,6 @@
"libkcal" -> "libkdepim";
"libkcal" -> "plugins";
"libkcal" -> "libktnef"
- "qgpgme" -> "libkleo";
- "gpgmepp" -> "kmail";
- "gpgmepp" -> "kleopatra";
- "gpgmepp" -> "libkleo";
- "gpgmepp" -> "qgpgme";
"libkdepim" -> "akregator";
"libkdepim" -> "kaddressbook";
"libkdepim" -> "kalarm";
--- trunk/KDE/kdepim/kaddressbook/editors/CMakeLists.txt #682119:682120
@@ -2,8 +2,7 @@
add_subdirectory( protocols )
add_subdirectory( icons )
-include_directories( ${CMAKE_SOURCE_DIR}/kaddressbook/interfaces \
${CMAKE_SOURCE_DIR}/kaddressbook ${CMAKE_SOURCE_DIR}/libkleo ${KDE4_INCLUDE_DIR} \
${GPGME_INCLUDES} ${CMAKE_SOURCE_DIR}/gpgmepp/
-${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/kaddressbook/interfaces \
${CMAKE_SOURCE_DIR}/kaddressbook ${CMAKE_SOURCE_DIR}/libkleo ${KDE4_INCLUDE_DIR} \
${GPGME_INCLUDES} ${QT_INCLUDES} )
########### next target ###############
--- trunk/KDE/kdepim/kaddressbook/xxport/CMakeLists.txt #682119:682120
@@ -1,5 +1,5 @@
-include_directories( ${CMAKE_SOURCE_DIR}/kaddressbook/interfaces \
${CMAKE_SOURCE_DIR}/kaddressbook ${CMAKE_SOURCE_DIR}/gpgmepp/ ) +include_directories( \
${CMAKE_SOURCE_DIR}/kaddressbook/interfaces ${CMAKE_SOURCE_DIR}/kaddressbook )
configure_file (config-xxport.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xxport.h )
@@ -28,7 +28,7 @@
-target_link_libraries(kaddrbk_vcard_xxport ${KDE4_KDECORE_LIBS} kaddressbook qgpgme \
) +target_link_libraries(kaddrbk_vcard_xxport ${KDE4_KDECORE_LIBS} kaddressbook \
gpgmepp qgpgme )
install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
endif(GPGME_FOUND)
--- trunk/KDE/kdepim/kalarm/CMakeLists.txt #682119:682120
@@ -8,7 +8,6 @@
${CMAKE_SOURCE_DIR}/kalarm/lib
${CMAKE_SOURCE_DIR}/kalarm/resources
${CMAKE_SOURCE_DIR}/libkleo
- ${CMAKE_SOURCE_DIR}/gpgmepp/
)
add_subdirectory( kalarmd )
--- trunk/KDE/kdepim/kleopatra/CMakeLists.txt #682119:682120
@@ -6,12 +6,12 @@
add_subdirectory( conf )
add_subdirectory( kwatchgnupg )
-include_directories( ${CMAKE_SOURCE_DIR}/libkleo ${CMAKE_SOURCE_DIR}/gpgmepp/ )
+include_directories( ${CMAKE_SOURCE_DIR}/libkleo )
########### next target ###############
set(kleopatra_bin_SRCS ${libconf_SRCS}
- customactions.cpp
+ customactions.cpp
aboutdata.cpp
main.cpp
certmanager.cpp
@@ -28,7 +28,7 @@
kde4_add_executable(kleopatra_bin ${kleopatra_bin_SRCS})
set_target_properties(kleopatra_bin PROPERTIES OUTPUT_NAME kleopatra)
-target_link_libraries(kleopatra_bin ${KDE4_UTILS_LIBS} ${KDE4_KABC_LIBS} \
${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} kleopatra) \
+target_link_libraries(kleopatra_bin ${KDE4_UTILS_LIBS} ${KDE4_KABC_LIBS} \
${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} gpgmepp qgpgme ${GPGME_LIBRARIES} \
kleopatra)
install(TARGETS kleopatra_bin DESTINATION ${BIN_INSTALL_DIR} )
--- trunk/KDE/kdepim/kmail/CMakeLists.txt #682119:682120
@@ -20,7 +20,7 @@
${CMAKE_SOURCE_DIR}/libkdepim ${CMAKE_BINARY_DIR}/libkdepim
${CMAKE_SOURCE_DIR}/libksieve
${CMAKE_SOURCE_DIR}/mimelib ${CMAKE_SOURCE_DIR}/libkleo
- ${GPGME_INCLUDES} ${CMAKE_SOURCE_DIR}/gpgmepp/
+ ${GPGME_INCLUDES}
)
--- trunk/KDE/kdepim/kontact/plugins/summary/CMakeLists.txt #682119:682120
@@ -3,7 +3,6 @@
${CMAKE_SOURCE_DIR}/kontact/interfaces
${CMAKE_SOURCE_DIR}/libkleo
${CMAKE_SOURCE_DIR}/libkdepim
- ${CMAKE_SOURCE_DIR}/libkpimidentities
)
--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #682119:682120
@@ -2,7 +2,6 @@
add_subdirectory( tests )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
- ${CMAKE_SOURCE_DIR}/libkpimidentities
${CMAKE_SOURCE_DIR}/libkholidays
${CMAKE_SOURCE_DIR}/mimelib ${CMAKE_SOURCE_DIR}/libkleo \
${CMAKE_SOURCE_DIR}/korganizer/printing ${CMAKE_SOURCE_DIR}/kdgantt1
--- trunk/KDE/kdepim/libkleo/CMakeLists.txt #682119:682120
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/libkpgp/ \
${CMAKE_BINARY_DIR}/libkleo/backends/chiasmus/ ${GPGME_INCLUDES} \
${CMAKE_SOURCE_DIR}/gpgmepp/ ) +include_directories( \
${CMAKE_BINARY_DIR}/libkleo/backends/chiasmus/ )
add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
@@ -85,7 +85,7 @@
kde4_add_library(kleopatra SHARED ${kleopatra_LIB_SRCS})
-target_link_libraries(kleopatra ${KDE4_KDE3SUPPORT_LIBS} qgpgme )
+target_link_libraries(kleopatra ${KDE4_KDE3SUPPORT_LIBS} gpgmepp qgpgme \
${GPGME_LIBRARIES} )
set_target_properties(kleopatra PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION} ) install(TARGETS kleopatra DESTINATION \
${LIB_INSTALL_DIR})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic