1 files changed, 22 insertions, 34 deletions
diff --git a/conduits/sysinfoconduit/CMakeLists.txt b/conduits/sysinfoconduit/CMakeLists.txt
index 99b862c..10f85e5 100644
--- a/conduits/sysinfoconduit/CMakeLists.txt
+++ b/conduits/sysinfoconduit/CMakeLists.txt
@@ -1,50 +1,38 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
 
-set(conduit_sysinfo_SRCS
-	sysinfo-setup.cc
-	sysinfo-factory.cc
-	sysinfo-conduit.cc
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_sysinfo_UIS
-	sysinfo-setup_dialog.ui
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_sysinfo_KCFGS
-	sysinfoSettings.kcfgc
-)
 
-kde3_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS})
-trinity_add_ui_files(conduit_sysinfo_SRCS ${conduit_sysinfo_UIS})
-trinity_automoc(${conduit_sysinfo_SRCS})
-add_library(conduit_sysinfo SHARED ${conduit_sysinfo_SRCS})
+##### conduit_sysinfo (kpart) ###################
 
-set_target_properties(
-	conduit_sysinfo PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+tde_add_kpart( conduit_sysinfo AUTOMOC
+  SOURCES sysinfoSettings.kcfgc sysinfo-factory.cc sysinfo-setup.cc
+    sysinfo-conduit.cc sysinfo-setup_dialog.ui
+  LINK kpilot-shared tdeui-shared tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_sysinfo)
 
-install(
-	TARGETS conduit_sysinfo
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES sysinfo_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES Template.html Template.txt
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/sysinfoconduit
 )
 
-install(
-	FILES sysinfoSettings.kcfgc sysinfoconduit.kcfg
-	DESTINATION ${KDE3_KCFG_DIR}
+install( FILES sysinfo_conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES Template.html Template.txt 
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/sysinfoconduit
+install( FILES sysinfoconduit.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )
-