Fix library cmake file

1 files changed, 55 insertions, 48 deletions

diff --git a/kbfxlib/common/CMakeLists.txt b/kbfxlib/common/CMakeLists.txt
index 929c8bb..c453732 100644
--- a/kbfxlib/common/CMakeLists.txt
+++ b/kbfxlib/common/CMakeLists.txt
@@ -1,48 +1,55 @@
-SET(libkbfxcommonsrc
-	kbfxkiodownload.cpp
-        kbfxpixmaplabel.cpp
-	kbfxconfig.cpp
-	kbfxpushbutton.cpp
-	kbfxthemesdata.cpp
-	kbfxfontchooser.cpp
-	kbfxplasmapixmapprovider.cpp
-	)
-
-FILE(GLOB HEADERS *.h)
-
-IF (NOT USE_KDE4)
-	KDE3_AUTOMOC(${libkbfxcommonsrc})
-
-	ADD_LIBRARY(kbfxcommon SHARED ${libkbfxcommonsrc})
-	SET_TARGET_PROPERTIES(kbfxcommon
-		PROPERTIES
-		COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-	# SET_TARGET_PROPERTIES(kbfxcommon PROPERTIES
-	#     SOVERSION ${LIB_MAJOR}
-	#     VERSION ${APPLICATION_VERSION})
-	TARGET_LINK_LIBRARIES(kbfxcommon
-	    ${QT_AND_TDECORE_LIBS}
-	    ${KDE3_KIO_LIBRARY}
-	    ${KDE3_UI_LIBRARY}
-	    ${KDE3_KHTML_LIBRARY}
-	    ${M_LIBRARY}
-	    )
-
-	KDE3_INSTALL_LIBTOOL_FILE(kbfxcommon ${LIB_INSTALL_DIR})
-ELSE (NOT USE_KDE4)
-	KDE4_AUTOMOC(${libkbfxcommonsrc})
-
-	KDE4_ADD_LIBRARY(kbfxcommon SHARED ${libkbfxcommonsrc})
-	TARGET_LINK_LIBRARIES(kbfxcommon
-	    ${KDE4_TDECORE_LIBS}
-	    ${KDE4_KIO_LIBS}
-	    ${KDE4_TDEUI_LIBS}
-	    ${KDE4_KHTML_LIBS}
-	    ${M_LIBRARY}
-	    )
-
-	KDE4_INSTALL_LIBTOOL_FILE(kbfxcommon ${LIB_INSTALL_DIR})
-ENDIF (NOT USE_KDE4)
-
-INSTALL(TARGETS kbfxcommon DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/common)
+#################################################
+#
+#  (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_BINARY_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/kio/kio
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES locate.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES locater.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES rlocate.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES locate.desktop DESTINATION ${SERVICES_INSTALL_DIR}/searchproviders )
+
+
+##### libkbfxcommonsrc ##############################
+
+set( target kbfxcommon )
+
+set( ${target}_SRCS
+  kbfxkiodownload.cpp kbfxpixmaplabel.cpp kbfxconfig.cpp
+  kbfxpushbutton.cpp kbfxthemesdata.cpp kbfxfontchooser.cpp
+  kbfxplasmapixmapprovider.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/common )