Fix config cmake files

(cherry picked from commit 7aaac3ed63)

configdialog/CMakeLists.txt

@@ -1,59 +1,52 @@
-SET(kbfxconfigappsrc
+#################################################
-    main.cpp
+#
-    kbfxconfigapp.cpp
+#  (C) 2011 Timothy Pearson
-    )
+#  kb9vqf (AT) pearsoncomputing.net
-
+#
-SET(kbfxconfigappui
+#  Improvements and feedback are welcome
-    kbfxthemeinfo.ui
+#
-    kbfxconfigdlgbutton.ui
+#  This file is released under GPL >= 2
-    kbfxconfigdlgmain.ui
+#
-    kbfxconfigdlgthemes.ui
+#################################################
-    kbfxconfigdlgabout.ui
+
-    kbfxconfigdlgstyle.ui
+include_directories(
-    kbfxconfigdlgtooltip.ui
+  ${TQT_INCLUDE_DIRS}
-    kbfxconfigdlgfonts-old.ui
+  ${TDE_INCLUDE_DIR}
-    kbfxconfigdlgplugins.ui
+  ${CMAKE_BINARY_DIR}
-    kbfxconfigdlglayout.ui
+  ${CMAKE_SOURCE_DIR}/kbfxlib/common
-    )
+  ${CMAKE_SOURCE_DIR}/kbfxlib/data
-
+  ${CMAKE_CURRENT_BINARY_DIR}
-IF (NOT USE_KDE4)
+  ${CMAKE_CURRENT_SOURCE_DIR}
-	KDE3_AUTOMOC(${kbfxconfigappsrc})
+)
-
+
-	KDE3_ADD_UI_FILES(kbfxconfigappsrc ${kbfxconfigappui})
+link_directories(
-
+  ${TQT_LIBRARY_DIRS}
-	KDE3_ADD_EXECUTABLE(kbfxconfigapp ${kbfxconfigappsrc})
+  ${CMAKE_BINARY_DIR}/kbfxlib/common
-
+  ${CMAKE_BINARY_DIR}/kbfxlib/data
-	TARGET_LINK_LIBRARIES(kbfxconfigapp
+)
-	    kbfxdata
+
-	    kbfxcommon
+
-	    ${QT_AND_KDECORE_LIBS}
+##### kbfxconfigapp (executable) ################
-	    -lDCOP
+
-	    ${KDE3_KIO_LIBRARY}
+tde_add_executable( kbfxconfigapp
-	    ${KDE3_UI_LIBRARY}
+  SOURCES main.cpp kbfxconfigapp.cpp kbfxthemeinfo.ui
-            -lkhtml
+          kbfxconfigdlgbutton.ui kbfxconfigdlgmain.ui
-	    )
+          kbfxconfigdlgthemes.ui kbfxconfigdlgabout.ui
-ELSE (NOT USE_KDE4)
+          kbfxconfigdlgstyle.ui kbfxconfigdlgtooltip.ui
-	KDE4_AUTOMOC(${kbfxconfigappsrc})
+          kbfxconfigdlgfonts-old.ui kbfxconfigdlgplugins.ui
-
+          kbfxconfigdlglayout.ui
-	KDE4_ADD_UI3_FILES(kbfxconfigappsrc ${kbfxconfigappui})
+  LINK ${TQT_LIBRARIES} kbfxdata kbfxcommon kdecore-shared kdeui-shared DCOP-shared kio-shared khtml-shared
-
+  DESTINATION ${BIN_INSTALL_DIR}
-	KDE4_ADD_EXECUTABLE(kbfxconfigapp ${kbfxconfigappsrc})
+)
-
+
-	TARGET_LINK_LIBRARIES(kbfxconfigapp
+
-	    kbfxdata
+##### configuration files #######################
-	    kbfxcommon
-	    ${KDE4_KDECORE_LIBS}
-	    ${KDE4_KIO_LIBS}
-	    ${KDE4_KDEUI_LIBS}
-	    )
-ENDIF (NOT USE_KDE4)
-
-INSTALL(TARGETS kbfxconfigapp
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 
 INSTALL(FILES kbfxconfigappui.rc DESTINATION ${DATA_INSTALL_DIR}/kbfxconfigapp)
+
+
+##### desktop files #############################
+
 INSTALL(FILES kbfxconfigapp.desktop kbfx_theme.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-INSTALL(FILES kbfx_install_theme.desktop kbfx_prepare_theme.desktop
+INSTALL(FILES kbfx_install_theme.desktop kbfx_prepare_theme.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus)
-    DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus)
+INSTALL(FILES x-kbfxtheme.desktop DESTINATION ${MIME_INSTALL_DIR}/application)
-INSTALL(FILES x-kbfxtheme.desktop
-    DESTINATION ${MIME_INSTALL_DIR}/application)