1 files changed, 20 insertions, 29 deletions
diff --git a/conduits/popmail/CMakeLists.txt b/conduits/popmail/CMakeLists.txt
index d2c63e9..c12e64a 100644
--- a/conduits/popmail/CMakeLists.txt
+++ b/conduits/popmail/CMakeLists.txt
@@ -1,43 +1,34 @@
+
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_popmail_SRCS
-	popmail-factory.cc
-	popmail-conduit.cc
-	setupDialog.cc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_popmail_UIS
-	setup-dialog.ui
-)
 
-set(conduit_popmail_KCFGS
-	popmailSettings.kcfgc
-)
+##### conduit_popmail (kpart) ###################
 
-kde3_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS})
-trinity_add_ui_files(conduit_popmail_SRCS ${conduit_popmail_UIS})
-trinity_automoc(${conduit_popmail_SRCS})
-add_library(conduit_popmail SHARED ${conduit_popmail_SRCS})
-
-set_target_properties(
-	conduit_popmail PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+tde_add_kpart( conduit_popmail AUTOMOC
+  SOURCES popmailSettings.kcfgc setup-dialog.ui popmail-factory.cc
+    setupDialog.cc popmail-conduit.cc
+  LINK kpilot-shared tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_popmail)
 
-install(
-	TARGETS conduit_popmail
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES popmail-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES popmail-conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES popmail.kcfg DESTINATION ${KDE3_KCFG_DIR}
+install( FILES popmail.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )