From 70e46300873f51517dbc2186ef7094ad349e7ca8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Nov 2011 15:37:22 -0600 Subject: [PATCH] Fix config cmake files (cherry picked from commit 7aaac3ed63e4907d6f6112dbc142952f06d0f8b1) --- configdialog/CMakeLists.txt | 105 +++++++++++++++++------------------- 1 file changed, 49 insertions(+), 56 deletions(-) diff --git a/configdialog/CMakeLists.txt b/configdialog/CMakeLists.txt index 3622ca0..a64b25a 100644 --- a/configdialog/CMakeLists.txt +++ b/configdialog/CMakeLists.txt @@ -1,59 +1,52 @@ -SET(kbfxconfigappsrc - main.cpp - kbfxconfigapp.cpp - ) - -SET(kbfxconfigappui - kbfxthemeinfo.ui - kbfxconfigdlgbutton.ui - kbfxconfigdlgmain.ui - kbfxconfigdlgthemes.ui - kbfxconfigdlgabout.ui - kbfxconfigdlgstyle.ui - kbfxconfigdlgtooltip.ui - kbfxconfigdlgfonts-old.ui - kbfxconfigdlgplugins.ui - kbfxconfigdlglayout.ui - ) - -IF (NOT USE_KDE4) - KDE3_AUTOMOC(${kbfxconfigappsrc}) - - KDE3_ADD_UI_FILES(kbfxconfigappsrc ${kbfxconfigappui}) - - KDE3_ADD_EXECUTABLE(kbfxconfigapp ${kbfxconfigappsrc}) - - TARGET_LINK_LIBRARIES(kbfxconfigapp - kbfxdata - kbfxcommon - ${QT_AND_KDECORE_LIBS} - -lDCOP - ${KDE3_KIO_LIBRARY} - ${KDE3_UI_LIBRARY} - -lkhtml - ) -ELSE (NOT USE_KDE4) - KDE4_AUTOMOC(${kbfxconfigappsrc}) - - KDE4_ADD_UI3_FILES(kbfxconfigappsrc ${kbfxconfigappui}) - - KDE4_ADD_EXECUTABLE(kbfxconfigapp ${kbfxconfigappsrc}) - - TARGET_LINK_LIBRARIES(kbfxconfigapp - kbfxdata - kbfxcommon - ${KDE4_KDECORE_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KDEUI_LIBS} - ) -ENDIF (NOT USE_KDE4) - -INSTALL(TARGETS kbfxconfigapp - RUNTIME DESTINATION ${BIN_INSTALL_DIR}) +################################################# +# +# (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_SOURCE_DIR}/kbfxlib/common + ${CMAKE_SOURCE_DIR}/kbfxlib/data + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${CMAKE_BINARY_DIR}/kbfxlib/common + ${CMAKE_BINARY_DIR}/kbfxlib/data +) + + +##### kbfxconfigapp (executable) ################ + +tde_add_executable( kbfxconfigapp + SOURCES main.cpp kbfxconfigapp.cpp kbfxthemeinfo.ui + kbfxconfigdlgbutton.ui kbfxconfigdlgmain.ui + kbfxconfigdlgthemes.ui kbfxconfigdlgabout.ui + kbfxconfigdlgstyle.ui kbfxconfigdlgtooltip.ui + kbfxconfigdlgfonts-old.ui kbfxconfigdlgplugins.ui + kbfxconfigdlglayout.ui + LINK ${TQT_LIBRARIES} kbfxdata kbfxcommon kdecore-shared kdeui-shared DCOP-shared kio-shared khtml-shared + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### configuration files ####################### 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 - DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus) -INSTALL(FILES x-kbfxtheme.desktop - DESTINATION ${MIME_INSTALL_DIR}/application) +INSTALL(FILES kbfx_install_theme.desktop kbfx_prepare_theme.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus) +INSTALL(FILES x-kbfxtheme.desktop DESTINATION ${MIME_INSTALL_DIR}/application)