Fix common/data cmake files

1 files changed, 46 insertions, 48 deletions

diff --git a/kbfxlib/data/CMakeLists.txt b/kbfxlib/data/CMakeLists.txt
index eb99dfe..6067300 100644
--- a/kbfxlib/data/CMakeLists.txt
+++ b/kbfxlib/data/CMakeLists.txt
@@ -1,48 +1,46 @@
-SET(libkbfxdatasrc
-	kbfxdatagroup.cpp
-	kbfxdatagrouplist.cpp
-	kbfxdatasource.cpp
-	kbfxdatastack.cpp
-	kbfxplasmadataplugin.cpp
-	kbfxplasmapluginloader.cpp
-	kbfxplugin.cpp
-	)
-
-FILE(GLOB HEADERS *.h)
-
-IF (NOT USE_KDE4)
-	KDE3_AUTOMOC(${libkbfxdatasrc})
-
-	ADD_LIBRARY(kbfxdata SHARED ${libkbfxdatasrc})
-	SET_TARGET_PROPERTIES(kbfxdata
-		PROPERTIES
-		COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-	# SET_TARGET_PROPERTIES(kbfxdata PROPERTIES
-	#     SOVERSION ${LIB_MAJOR}
-	#     VERSION ${APPLICATION_VERSION})
-	TARGET_LINK_LIBRARIES(kbfxdata
-	    ${QT_AND_TDECORE_LIBS}
-	    ${KDE3_KIO_LIBRARY}
-	    ${KDE3_UI_LIBRARY}
-	    ${KDE3_KHTML_LIBRARY}
-	    ${M_LIBRARY}
-	    )
-
-	KDE3_INSTALL_LIBTOOL_FILE(kbfxdata ${LIB_INSTALL_DIR})
-ELSE (NOT USE_KDE4)
-	KDE4_AUTOMOC(${libkbfxdatasrc})
-
-	KDE4_ADD_LIBRARY(kbfxdata SHARED ${libkbfxdatasrc})
-	TARGET_LINK_LIBRARIES(kbfxdata
-	    ${KDE4_TDECORE_LIBS}
-	    ${KDE4_KIO_LIBS}
-	    ${KDE4_TDEUI_LIBS}
-	    ${KDE4_KHTML_LIBS}
-	    ${M_LIBRARY}
-	    )
-
-	KDE4_INSTALL_LIBTOOL_FILE(kbfxdata ${LIB_INSTALL_DIR})
-ENDIF (NOT USE_KDE4)
-
-INSTALL(TARGETS kbfxdata DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/data)
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kbfxdata ##################################
+
+set( target kbfxdata )
+
+set( ${target}_SRCS
+  kbfxdatagroup.cpp kbfxdatagrouplist.cpp kbfxdatasource.cpp
+  kbfxdatastack.cpp kbfxplasmadataplugin.cpp kbfxplasmapluginloader.cpp
+  kbfxplugin.cpp
+)
+
+tde_add_library( ${target} SHARED AUTOMOC
+  SOURCES ${${target}_SRCS}
+#   VERSION 4.2.0
+  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared khtml-shared ${M_LIBRARY}
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### headers #######################################
+
+file( GLOB HEADERS *.h )
+install( FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/data )