From 657d173148f3db568aabe5f531f4bacbbda490ac Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Nov 2011 20:13:06 -0600 Subject: [PATCH] Fix FTBFS --- config/CMakeLists.txt | 49 ++++++++++++++++++++++++++++++++----------- style/CMakeLists.txt | 4 ++-- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 2ea345d..24cd274 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -1,12 +1,37 @@ -if (QTC_STYLE_SUPPORT) - set(kstyle_qtcurve_config_PART_SRCS qtcurveconfig.cpp exportthemedialog.cpp) -else (QTC_STYLE_SUPPORT) - set(kstyle_qtcurve_config_PART_SRCS qtcurveconfig.cpp) -endif (QTC_STYLE_SUPPORT) - -include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}) -trinity_add_ui_files(kstyle_qtcurve_config_PART_SRCS qtcurveconfigbase.ui) -trinity_add_kpart(kstyle_qtcurve_config ${kstyle_qtcurve_config_PART_SRCS}) -trinity_automoc(${kstyle_qtcurve_config_PART_SRCS}) -target_link_libraries(kstyle_qtcurve_config ${QT_AND_TDECORE_LIBS} kio tdeui) -install(TARGETS kstyle_qtcurve_config DESTINATION ${KDE3_LIB_DIR}/trinity) +################################################# +# +# (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_DIRS} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIBRARY_DIRS} +) + + +##### kstyle_qtcurve_config ##################### + +set( target kstyle_qtcurve_config ) + +set( ${target}_SRCS + qtcurveconfig.cpp exportthemedialog.cpp +) + +tde_add_kpart( ${target} AUTOMOC + SOURCES ${${target}_SRCS} + LINK tdeui-shared kio-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/style/CMakeLists.txt b/style/CMakeLists.txt index 5190118..fe93ab4 100644 --- a/style/CMakeLists.txt +++ b/style/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################# # -# (C) 2010 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com +# (C) 2011 Timothy Pearson +# kb9vqf (AT) pearsoncomputing.net # # Improvements and feedback are welcome #